From b4cd387dff0a4eaa24562b8ba0be8bb2e33aa6a8 Mon Sep 17 00:00:00 2001
From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Sun, 25 Nov 2007 14:06:43 +0100
Subject: [PATCH] Convert remaining iso language codes

Also try to improve the descriptions for the Chinese
variants a bit.
---
 lib/Packages/I18N/LanguageNames.pm | 14 +++++++-------
 lib/Packages/I18N/Languages.pm     | 20 ++++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/lib/Packages/I18N/LanguageNames.pm b/lib/Packages/I18N/LanguageNames.pm
index 65ab7f9..6155f33 100644
--- 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 ae63ee7..404aadd 100644
--- a/lib/Packages/I18N/Languages.pm
+++ b/lib/Packages/I18N/Languages.pm
@@ -74,20 +74,20 @@ my %selflang = (
 		"no"   => 'norsk&nbsp;(bokm&aring;l)',
 		pl     => 'polski',
 		pt     => 'Portugu&ecirc;s (pt)',
-		pt_PT  => 'Portugu&ecirc;s (pt)',
-		pt_BR  => 'Portugu&ecirc;s (br)',
+		'pt-pt'=> 'Portugu&ecirc;s (pt)',
+		'pt-br'=> 'Portugu&ecirc;s (br)',
 		ro     => 'rom&acirc;n&#259;',
 		ru     => '&#1056;&#1091;&#1089;&#1089;&#1082;&#1080;&#1081;',
 		sk     => 'slovensky',
 		sv     => 'svenska',
-		sv_SE  => 'svenska',
+		'sv-se'=> 'svenska',
 		sl     => 'sloven&#353;&#269;ina',
 		tr     => 'T&uuml;rk&ccedil;e',
 		uk     => '&#1091;&#1082;&#1088;&#1072;&#1111;&#1085;&#1089;&#1100;&#1082;&#1072;',
 		zh     => '&#20013;&#25991;',
-		zh_CN  => '&#31777;&#39636;&#20013;&#25991;',
-		zh_HK  => '&#27491;&#39636;&#20013;&#25991;',
-		zh_TW  => '&#27491;&#39636;&#20013;&#25991;',
+		'zh-cn'=> '&#20013;&#25991;',
+		'zh-hk'=> '&#27491;&#39636;&#20013;&#25991;',
+		'zh-tw'=> '&#20013;&#25991;',
 		);
 
 # 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,&#31616;",
+		'zh-hk'=> "Zhongzu,HK",
+		'zh-tw'=> "Zhongzu,&#32321;",
 		);
 
 # second transliteration table, used for languages starting with a latin
-- 
2.39.2