diff options
| author | Steve Peters <steve@fisharerojo.org> | 2006-05-10 15:03:03 +0000 |
|---|---|---|
| committer | Steve Peters <steve@fisharerojo.org> | 2006-05-10 15:03:03 +0000 |
| commit | 5a1dbf3942f1e2ad6a95fb40929e663709bd4e44 (patch) | |
| tree | bcecc0fb308b7c137e62b0e749436afa6b3c98ac /ext | |
| parent | 3cacfbb9b2d87693f7e1ca19103800cc2118ccb4 (diff) | |
| download | perl-5a1dbf3942f1e2ad6a95fb40929e663709bd4e44.tar.gz | |
Upgrade to Encode-2.17
p4raw-id: //depot/perl@28152
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/Encode/Changes | 11 | ||||
| -rw-r--r-- | ext/Encode/Encode.pm | 4 | ||||
| -rw-r--r-- | ext/Encode/encoding.pm | 2 |
3 files changed, 14 insertions, 3 deletions
diff --git a/ext/Encode/Changes b/ext/Encode/Changes index a904e3c696..cef5e121f5 100644 --- a/ext/Encode/Changes +++ b/ext/Encode/Changes @@ -3,6 +3,17 @@ # $Id: Changes,v 2.16 2006/05/03 18:24:10 dankogai Exp $ # $Revision: 2.16 $ $Date: 2006/05/03 18:24:10 $ +! encode.pm + 'chin' =~ /^zh_CN|chin(?:a|ese)?$/i is true + but chin is not china or chinese. + http://d.hatena.ne.jp/jankogai/20060508/1147090316 +! Encode.xs + Integrated maintperl change (27824|27824) which I overlooked + -- sorry, Nicholas and Coverity Scan. + Message-Id: <200604152115.k3FLF1Ar014538@smtp3.ActiveState.com> + Message-Id: <200605091615.k49GF1gJ016777@smtp3.ActiveState.com> + +2.16 2006/05/03 18:24:10 ! bin/piconv --xmlcref and --htmlcref added. ! Encode.pm diff --git a/ext/Encode/Encode.pm b/ext/Encode/Encode.pm index 61a5e89794..439d0b14c5 100644 --- a/ext/Encode/Encode.pm +++ b/ext/Encode/Encode.pm @@ -1,9 +1,9 @@ # -# $Id: Encode.pm,v 2.16 2006/05/03 18:32:25 dankogai Exp dankogai $ +# $Id: Encode.pm,v 2.17 2006/05/09 17:10:42 dankogai Exp dankogai $ # package Encode; use strict; -our $VERSION = sprintf "%d.%02d", q$Revision: 2.16 $ =~ /(\d+)/g; +our $VERSION = sprintf "%d.%02d", q$Revision: 2.17 $ =~ /(\d+)/g; sub DEBUG () { 0 } use XSLoader (); XSLoader::load( __PACKAGE__, $VERSION ); diff --git a/ext/Encode/encoding.pm b/ext/Encode/encoding.pm index bf0fc693d7..cca72fc98d 100644 --- a/ext/Encode/encoding.pm +++ b/ext/Encode/encoding.pm @@ -83,7 +83,7 @@ sub _get_locale_encoding { elsif ( $country_language =~ /^ko_KR|korean?$/i ) { $locale_encoding = 'euc-kr'; } - elsif ( $country_language =~ /^zh_CN|chin(?:a|ese)?$/i ) { + elsif ( $country_language =~ /^zh_CN|chin(?:a|ese)$/i ) { $locale_encoding = 'euc-cn'; } elsif ( $country_language =~ /^zh_TW|taiwan(?:ese)?$/i ) { |