Convert remaining iso language codes

Also try to improve the descriptions for the Chinese
variants a bit.

diff --git a/lib/Packages/I18N/LanguageNames.pm b/lib/Packages/I18N/LanguageNames.pm
index 65ab7f957e1e5e8b9380b21ead389f704f9ad884..6155f336e3d1fa6e1eb1f5b10a060e6ef4daf9c1 100644 (file)
--- a/lib/Packages/I18N/LanguageNames.pm
+++ b/lib/Packages/I18N/LanguageNames.pm
@@ -27,17 +27,17 @@ my %ctrans = (
        ko    => N_("Korean"),
        es    => N_("Spanish"),
        pt    => N_("Portuguese"),
-       pt_BR => N_("Portuguese (Brasilia)"),
-       pt_PT => N_("Portuguese (Portugal)"),
+       'pt-br'=> N_("Portuguese (Brasilia)"),
+       'pt-pt'=> N_("Portuguese (Portugal)"),
        zh    => N_("Chinese"),
-       zh_CN => N_("Chinese (China)"),
-       zh_HK => N_("Chinese (Hong Kong)"),
-       zh_TW => N_("Chinese (Taiwan)"),
+       'zh-cn'=> N_("Chinese (China)"),
+       'zh-hk'=> N_("Chinese (Hong Kong)"),
+       'zh-tw'=> N_("Chinese (Taiwan)"),
        sv    => N_("Swedish"),
-       sv_SE => N_("Swedish"),
+       'sv-se'=> N_("Swedish"),
        pl    => N_("Polish"),
        'no'  => N_("Norwegian"),
-       'tr'    => N_("Turkish"),
+       'tr'  => N_("Turkish"),
        ru    => N_("Russian"),
        cs    => N_("Czech"),
        eo    => N_("Esperanto"),

diff --git a/lib/Packages/I18N/Languages.pm b/lib/Packages/I18N/Languages.pm
index ae63ee787ef9403a44f36e2e00f329365fad1e0e..404aadd2a22038e2a9fd17a2fc06044371e0ee9d 100644 (file)
--- a/lib/Packages/I18N/Languages.pm
+++ b/lib/Packages/I18N/Languages.pm
@@ -74,20 +74,20 @@ my %selflang = (
                "no"   => 'norsk (bokmål)',
                pl     => 'polski',
                pt     => 'Português (pt)',
-               pt_PT  => 'Português (pt)',
-               pt_BR  => 'Português (br)',
+               'pt-pt'=> 'Português (pt)',
+               'pt-br'=> 'Português (br)',
                ro     => 'română',
                ru     => 'Русский',
                sk     => 'slovensky',
                sv     => 'svenska',
-               sv_SE  => 'svenska',
+               'sv-se'=> 'svenska',
                sl     => 'slovenščina',
                tr     => 'Türkçe',
                uk     => 'українська',
                zh     => '中文',
-               zh_CN  => '簡體中文',
-               zh_HK  => '正體中文',
-               zh_TW  => '正體中文',
+               'zh-cn'=> '中文',
+               'zh-hk'=> '正體中文',
+               'zh-tw'=> '中文',
                );
 
 # language directory name => Latin transliteration of the language name
@@ -104,10 +104,10 @@ my %translit = (
                ko => "Hangul", # Not sure. "Hanguk-Mal" (=Spoken Korean)?
                ru => "Russkij",
                uk => "ukrajins'ka",
-               zh => "Zhongzu", # Not printed due to Chinese-specific code; kept for sort order
-               zh_CN => "Simplified Chinese",
-               zh_HK => "Traditional Chinese",
-               zh_TW => "Traditional Chinese",
+               zh => "Zhongzu",
+               'zh-cn'=> "Zhongzu,简",
+               'zh-hk'=> "Zhongzu,HK",
+               'zh-tw'=> "Zhongzu,繁",
                );
 
 # second transliteration table, used for languages starting with a latin