Fixed in 1.04; NMU-diff follows. (It's unclear to me what use these language names have now. The langmap functions are only used by the etch/kde script which seems to map them back to language/country components! I'm also concerned that it's ignoring the specified locale encoding, but I'm not entirely clear how that's used.)
Ben.
diff -Nru localization-config-1.03/conffiles.d/common/langmap.pl
localization-config-1.04/conffiles.d/common/langmap.pl
--- localization-config-1.03/conffiles.d/common/langmap.pl 2007-12-15
00:02:05.000000000 +0000
+++ localization-config-1.04/conffiles.d/common/langmap.pl 2008-10-13
01:23:57.000000000 +0100
@@ -7,66 +7,65 @@
my %lang_locale_map = (
# entries sorted alphabetically
- 'bs_BA.ISO8859-2' => 'Bosnian',
- 'bg_BG' => 'Bulgarian',
- '[EMAIL PROTECTED]' => 'Catalan',
- 'cs_CZ' => 'Czech',
- 'da_DK' => 'Danish',
- '[EMAIL PROTECTED]' => 'German (BE)',
+ 'bs' => 'Bosnian',
+ 'bg' => 'Bulgarian',
+ 'ca' => 'Catalan',
+ 'cs' => 'Czech',
+ 'da' => 'Danish',
+ 'de_BE' => 'German (BE)',
'de_CH' => 'Swiss (DE)',
- '[EMAIL PROTECTED]' => 'German (DE)',
- 'el_GR.UTF-8' => 'Greek',
+ 'de' => 'German (DE)',
+ 'el' => 'Greek',
'en_AU' => 'Australian',
'en_CA' => 'Canadian',
- '[EMAIL PROTECTED]' => 'Irish (UK)',
- '[EMAIL PROTECTED]' => 'Irish',
- '[EMAIL PROTECTED]' => 'Galician',
+ 'en_IE' => 'Irish (UK)',
+ 'ga' => 'Irish',
+ 'gl' => 'Galician',
'en_GB' => 'British',
- 'gd_GB' => 'Scots Gaelic',
- 'gv_GB' => 'Manx Gaelic',
- 'kw_GB' => 'Cornish',
- 'en_US' => 'American (US)',
+ 'gd' => 'Scots Gaelic',
+ 'gv' => 'Manx Gaelic',
+ 'kw' => 'Cornish',
+ 'en' => 'American (US)',
'es' => 'Spanish',
'es_AR' => 'Spanish (AR)',
- '[EMAIL PROTECTED]' => 'Spanish (ES)',
+ 'es_ES' => 'Spanish (ES)',
'es_MX' => 'Spanish (MX)',
'es_PE' => 'Spanish (PE)',
- 'fa_IR.UTF-8' => 'Faroe',
- '[EMAIL PROTECTED]' => 'Finnish',
+ 'fa' => 'Faroe',
+ 'fi' => 'Finnish',
'fr_BE' => 'French (BE)',
'fr_CA' => 'French (CA)',
'fr_CH' => 'Swiss (FR)',
- '[EMAIL PROTECTED]' => 'French',
- 'he_IL' => 'Hebrew',
- 'he_IL.UTF-8' => 'Hebrew',
- 'hu_HU' => 'Hungarian',
- '[EMAIL PROTECTED]' => 'Italian',
- 'ja_JP.EUC-JP' => 'Japanese',
- 'ko_KR' => 'Korean',
- 'lv_LV' => 'Latvian',
- 'lt_LT' => 'Lithuanian',
- 'mk_MK' => 'Macedonian',
- 'nb_NO' => 'Norwegian',
- '[EMAIL PROTECTED]' => 'German (ndk)',
- '[EMAIL PROTECTED]' => 'Dutch (BE)',
- '[EMAIL PROTECTED]' => 'Dutch',
- 'nn_NO' => 'New Norwegian',
- 'no_NO' => 'Norwegian',
- 'pa_IN' => 'Punjabi (Gumurkhi)',
- 'pl_PL' => 'Polish',
- 'pt_PT' => 'Portuguese',
+ 'fr' => 'French',
+ 'he' => 'Hebrew',
+ 'hu' => 'Hungarian',
+ 'it' => 'Italian',
+ 'ja' => 'Japanese',
+ 'ko' => 'Korean',
+ 'lv' => 'Latvian',
+ 'lt' => 'Lithuanian',
+ 'mk' => 'Macedonian',
+ 'nb' => 'Norwegian',
+ 'nds' => 'German (ndk)',
+ 'nl_BE' => 'Dutch (BE)',
+ 'nl' => 'Dutch',
+ 'nn' => 'New Norwegian',
+ 'no' => 'Norwegian',
+ 'pa' => 'Punjabi (Gumurkhi)',
+ 'pl' => 'Polish',
+ 'pt' => 'Portuguese',
'pt_BR' => 'Brazilian',
- 'ru_RU' => 'Russian',
- 'se_NO' => 'Saami',
- 'sk_SK' => 'Slovakian',
- 'sl_SI' => 'Slovenian',
- 'sq_AL' => 'Albanian',
- 'sv_SE' => 'Swedish',
+ 'ru' => 'Russian',
+ 'se' => 'Saami',
+ 'sk' => 'Slovakian',
+ 'sl' => 'Slovenian',
+ 'sq' => 'Albanian',
+ 'sv' => 'Swedish',
'sv_FI' => 'Swedish (FI)',
- 'th_TH' => 'Thai',
- 'tr_TR' => 'Turkish',
- 'tl_PH' => 'Tagalog',
- 'uk_UA' => 'Ukrainian',
+ 'th' => 'Thai',
+ 'tr' => 'Turkish',
+ 'tl' => 'Tagalog',
+ 'uk' => 'Ukrainian',
) ;
sub get_lang_map() {
diff -Nru localization-config-1.03/debian/changelog
localization-config-1.04/debian/changelog
--- localization-config-1.03/debian/changelog 2008-04-04 04:53:42.000000000
+0100
+++ localization-config-1.04/debian/changelog 2008-10-13 01:28:59.000000000
+0100
@@ -1,3 +1,16 @@
+localization-config (1.04) unstable; urgency=low
+
+ * Non-maintainer upload
+ * Simplify the default language map to avoid the last resort of
+ choosing a random dialect:
+ - Remove all encoding suffixes including @euro, since none of the
+ named locales are distinguished only by encoding (Closes: #498095)
+ - Select a default locale for each language with multiple named
+ locales, and remove the country suffix from that
+ - Remove country suffixes for languages with a single named locale
+
+ -- Ben Hutchings <[EMAIL PROTECTED]> Mon, 13 Oct 2008 01:25:32 +0100
+
localization-config (1.03) unstable; urgency=low
[ Christian Perrier ]
--- END ---
signature.asc
Description: This is a digitally signed message part
