diff options
| author | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2004-06-22 07:34:40 +0000 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2004-06-22 07:34:40 +0000 |
| commit | 8fcd89ecada0e6697e7afc9f417751d97c9e70dc (patch) | |
| tree | 06c7200aa96878821f3bf2de9c93d6d0cc60f1a7 /lib/I18N | |
| parent | 00da7942926f78f065bf22f95a34f99cf3d0b5bf (diff) | |
| download | perl-8fcd89ecada0e6697e7afc9f417751d97c9e70dc.tar.gz | |
Upgrade to I18N::LangTags 0.32
p4raw-id: //depot/perl@22964
Diffstat (limited to 'lib/I18N')
| -rw-r--r-- | lib/I18N/LangTags.pm | 4 | ||||
| -rw-r--r-- | lib/I18N/LangTags/ChangeLog | 11 | ||||
| -rw-r--r-- | lib/I18N/LangTags/Detect.pm | 8 | ||||
| -rw-r--r-- | lib/I18N/LangTags/t/80_all_env.t | 3 |
4 files changed, 19 insertions, 7 deletions
diff --git a/lib/I18N/LangTags.pm b/lib/I18N/LangTags.pm index b94ded2de7..105443241c 100644 --- a/lib/I18N/LangTags.pm +++ b/lib/I18N/LangTags.pm @@ -1,5 +1,5 @@ -# Time-stamp: "2004-06-17 23:04:06 PDT" +# Time-stamp: "2004-06-20 21:48:03 ADT" # Sean M. Burke <sburke@cpan.org> require 5.000; @@ -19,7 +19,7 @@ require Exporter; ); %EXPORT_TAGS = ('ALL' => \@EXPORT_OK); -$VERSION = "0.31"; +$VERSION = "0.32"; sub uniq { my %seen; return grep(!($seen{$_}++), @_); } # a util function diff --git a/lib/I18N/LangTags/ChangeLog b/lib/I18N/LangTags/ChangeLog index 22e0210e5d..57477cc84b 100644 --- a/lib/I18N/LangTags/ChangeLog +++ b/lib/I18N/LangTags/ChangeLog @@ -1,6 +1,15 @@ Revision history for Perl module I18N::LangTags. - Time-stamp: "2004-06-17 23:07:01 PDT" + Time-stamp: "2004-06-20 21:50:16 ADT" +2004-06-20 Sean M. Burke sburke@cpan.org + + * Release 0.32 + + Minor bugfix version: + The test 80_all_env.t was erroneously failing under MSWins that + had Win32::Locale installed. A workaround added. + + 2004-06-17 Sean M. Burke sburke@cpan.org * Release 0.31 diff --git a/lib/I18N/LangTags/Detect.pm b/lib/I18N/LangTags/Detect.pm index ccef6dd5a2..3f1b7c006a 100644 --- a/lib/I18N/LangTags/Detect.pm +++ b/lib/I18N/LangTags/Detect.pm @@ -1,5 +1,5 @@ -# Time-stamp: "2004-06-17 22:59:06 PDT" +# Time-stamp: "2004-06-20 21:47:55 ADT" require 5; package I18N::LangTags::Detect; @@ -11,7 +11,7 @@ use vars qw( @ISA $VERSION $MATCH_SUPERS $USING_LANGUAGE_TAGS BEGIN { unless(defined &DEBUG) { *DEBUG = sub () {0} } } # define the constant 'DEBUG' at compile-time -$VERSION = "1.02"; +$VERSION = "1.03"; @ISA = (); use I18N::LangTags qw(alternate_language_tags locale2language_tag); @@ -57,7 +57,9 @@ sub ambient_langprefs { # always returns things untainted last; # first one wins } - if(&_try_use('Win32::Locale')) { + if($ENV{'IGNORE_WIN32_LOCALE'}) { + # no-op + } elsif(&_try_use('Win32::Locale')) { # If we have that module installed... push @languages, Win32::Locale::get_language() || '' if defined &Win32::Locale::get_language; diff --git a/lib/I18N/LangTags/t/80_all_env.t b/lib/I18N/LangTags/t/80_all_env.t index 3711318e93..050c8f2039 100644 --- a/lib/I18N/LangTags/t/80_all_env.t +++ b/lib/I18N/LangTags/t/80_all_env.t @@ -1,7 +1,7 @@ require 5; use Test; -# Time-stamp: "2004-06-17 22:59:30 PDT" +# Time-stamp: "2004-06-20 21:51:11 ADT" BEGIN { plan tests => 14; } use I18N::LangTags::Detect 1.01; print "# Hi there...\n"; @@ -33,6 +33,7 @@ sub printenv { print "# [end of ENV]\n#\n"; } +$ENV{'IGNORE_WIN32_LOCALE'} = 1; # a hack, just for testing's sake. print "# Test LANG...\n"; $ENV{'REQUEST_METHOD'} = ''; |