Upgrade to Locale::Maketext 1.12

[p5sagit/p5-mst-13.2.git] / lib / Locale / Language.pm

diff --git a/lib/Locale/Language.pm b/lib/Locale/Language.pm
index a00559f..e8454c3 100644 (file)
--- a/lib/Locale/Language.pm
+++ b/lib/Locale/Language.pm
@@ -1,7 +1,7 @@
 #
 # Locale::Language - ISO two letter codes for language identification (ISO 639)
 #
-# $Id: Language.pm,v 2.1 2002/02/06 04:07:10 neilb Exp $
+# $Id: Language.pm,v 2.7 2004/06/10 21:19:34 neilb Exp $
 #
 
 package Locale::Language;
@@ -14,7 +14,7 @@ require Exporter;
 #      Public Global Variables
 #-----------------------------------------------------------------------
 use vars qw($VERSION @ISA @EXPORT);
-$VERSION      = sprintf("%d.%02d", q$Revision: 2.1 $ =~ /(\d+)\.(\d+)/);
+$VERSION      = sprintf("%d.%02d", q$Revision: 2.7 $ =~ /(\d+)\.(\d+)/);
 @ISA          = qw(Exporter);
 @EXPORT       = qw(&code2language &language2code
                    &all_language_codes &all_language_names );
@@ -104,10 +104,10 @@ sub all_language_names
 # initialisation code - stuff the DATA into the CODES hash
 #=======================================================================
 {
-    my $code;
-    my $language;
+    my    $code;
+    my    $language;
+    local $_;
 
-    use bytes;
 
     while (<DATA>)
     {
@@ -117,6 +117,8 @@ sub all_language_names
         $CODES{$code} = $language;
         $LANGUAGES{"\L$language"} = $code;
     }
+
+    close(DATA);
 }
 
 1;
@@ -230,7 +232,7 @@ mt:Maltese
 my:Burmese
 
 na:Nauru
-nb:Norwegian Bokmål
+nb:Norwegian Bokmal
 nd:Ndebele, North
 ne:Nepali
 ng:Ndonga
@@ -299,7 +301,7 @@ ur:Urdu
 uz:Uzbek
 
 vi:Vietnamese
-vo:Volapük
+vo:Volapuk
 
 wo:Wolof