Change 11250 by jhi@alpha on 2001/07/10 03:55:38
Require I18N::Langinfo, not use.
Affected files ...
... //depot/perl/lib/open.pm#14 edit
Differences ...
==== //depot/perl/lib/open.pm#14 (text) ====
Index: perl/lib/open.pm
--- perl/lib/open.pm.~1~ Mon Jul 9 22:00:06 2001
+++ perl/lib/open.pm Mon Jul 9 22:00:06 2001
@@ -10,7 +10,8 @@
sub _get_locale_encoding {
unless (defined $locale_encoding) {
- eval { use I18N::Langinfo qw(langinfo CODESET) };
+ eval { require I18N::Langinfo;
+ import I18N::Langinfo qw(langinfo CODESET) };
unless ($@) {
$locale_encoding = langinfo(CODESET);
}
@@ -32,11 +33,11 @@
if (defined $locale_encoding &&
$locale_encoding eq 'euc' &&
defined $country_language) {
- if ($country_language =~ /^ja_JP|japan(?:ese)$/i) {
+ if ($country_language =~ /^ja_JP|japan(?:ese)?$/i) {
$locale_encoding = 'eucjp';
- } elsif ($country_language =~ /^ko_KR|korea(?:n)$/i) {
+ } elsif ($country_language =~ /^ko_KR|korea(?:n)?$/i) {
$locale_encoding = 'euckr';
- } elsif ($country_language =~ /^zh_TW|taiwan(?:ese)$/i) {
+ } elsif ($country_language =~ /^zh_TW|taiwan(?:ese)?$/i) {
$locale_encoding = 'euctw';
}
croak "Locale encoding 'euc' too ambiguous"
End of Patch.
