a bit of locales corrections

1 files changed, 20 insertions, 24 deletions

diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index ebb2cd3e0..7c0ff29fb 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -49,10 +49,9 @@ our %langs = (
 'fo' =>    [ 'Faroese',             'Foroyskt',          'fo_FO', '1    ', 'iso-8859-1' ],
 'fr' =>    [ 'French',              'Francais',          'fr_FR', '1 345', 'iso-8859-15' ],
 'ga' =>    [ 'Gaelic (Irish)',      'Gaeilge',           'ga_IE', '1    ', 'iso-8859-15', 'ga:en_IE:en_GB:en' ],
-#'gd' =>   [ 'Gaelic (Scottish)',   'Gaidhlig',          'gb_GB', '1    ', 'utf_lat8',    'gd:en_GB:en' ],
+#'gd' =>   [ 'Gaelic (Scottish)',   'Gaidhlig',          'gd_GB', '1    ', 'utf_lat8',    'gd:en_GB:en' ],
 'gl' =>    [ 'Galician',            'Galego',            'gl_ES', '1    ', 'iso-8859-15', 'gl:es_ES:es:pt:pt_BR' ],
-#- there isn't yet a gu_IN locale, using hi_IN instead
-'gu' =>    [ 'Gujarati',            'ZZ Gujarati',       'hi_IN', ' 2   ', 'unicode' ],
+'gu' =>    [ 'Gujarati',            'ZZ Gujarati',       'gu_IN', ' 2   ', 'unicode' ],
 #'gv' =>   [ 'Gaelic (Manx)',       'Gaelg',             'gv_GB', '1    ', 'utf_lat8',    'gv:en_GB:en' ],
 'he' =>    [ 'Hebrew',              'AA Ivrit',          'he_IL', ' 2   ', 'utf_he' ],
 'hi' =>    [ 'Hindi',               'ZZ Hindi',          'hi_IN', ' 2   ', 'unicode' ],
@@ -60,7 +59,7 @@ our %langs = (
 'hu' =>    [ 'Hungarian',           'Magyar',            'hu_HU', '1    ', 'iso-8859-2' ],
 'hy' =>    [ 'Armenian',            'ZZ Armenian',       'hy_AM', ' 2   ', 'utf_hy' ],
 # locale not done yet
-'ia' =>    [ 'Interlingua',         'Interlingua',       'ia_XX', '1   5', 'utf8' ],
+#'ia' =>   [ 'Interlingua',         'Interlingua',       'ia_XX', '1   5', 'utf8' ],
 'id' =>    [ 'Indonesian',          'Bahasa Indonesia',  'id_ID', ' 2   ', 'iso-8859-1' ],
 'is' =>    [ 'Icelandic',           'Islenska',          'is_IS', '1    ', 'iso-8859-1' ],
 'it' =>    [ 'Italian',             'Italiano',          'it_IT', '1    ', 'iso-8859-15' ],
@@ -70,11 +69,9 @@ our %langs = (
 #-'kl' =>  [ 'Greenlandic (inuit)', 'ZZ Inuit',          'kl_GL', '    5', 'iso-8859-1' ],
 'kn' =>    [ 'Kannada',             'ZZ Kannada',        'kn_IN', ' 2   ', 'utf_kn' ],
 'ko' =>    [ 'Korean',              'ZZ Korea',          'ko_KR', ' 2   ', 'ksc5601' ],
-# locale not done yet
 'ku' =>    [ 'Kurdish',             'Kurdi',             'ku_TR', ' 2   ', 'iso-8859-9' ],
 #-'kw' =>  [ 'Cornish',             'Kernewek',          'kw_GB', '1    ', 'utf_lat8',    'kw:en_GB:en' ],
-# no li_NL locale yet; using nl_NL instead and defning LANGUAGE
-'li' =>    [ 'Limbourgish',         'Limburgs',          'nl_NL', '1    ', 'iso-8859-15' ],
+'li' =>    [ 'Limbourgish',         'Limburgs',          'li_NL', '1    ', 'iso-8859-15' ],
 'lo' =>    [ 'Laotian',             'Laotian',           'lo_LA', ' 2   ', 'utf_lo' ],
 'lt' =>    [ 'Lithuanian',          'Lietuviskai',       'lt_LT', '1    ', 'iso-8859-13' ],
 'lv' =>    [ 'Latvian',             'Latviesu',          'lv_LV', '1    ', 'iso-8859-13' ],
@@ -85,9 +82,8 @@ our %langs = (
 'mr' =>    [ 'Marathi',             'ZZ Marathi',        'mr_IN', ' 2   ', 'unicode' ],
 'ms' =>    [ 'Malay',               'Bahasa Melayu',     'ms_MY', ' 2   ', 'iso-8859-1' ],
 'mt' =>    [ 'Maltese',             'Maltin',            'mt_MT', '1 3  ', 'unicode' ],
-'nb' =>    [ 'Norwegian Bokmaal',   'Norsk, Bokmal',     'no_NO', '1    ', 'iso-8859-1',  'nb:no' ],
+'nb' =>    [ 'Norwegian Bokmaal',   'Norsk, Bokmal',     'nb_NO', '1    ', 'iso-8859-1',  'nb:no' ],
 #'nds' =>   [ 'Low Saxon',           'Platduutsch',      'nds_DE', '1    ', 'iso-8859-1' ],
-# locale?
 'ne' =>    [ 'Nepali',              'ZZ Nepali',         'ne_IN', ' 2   ', 'unicode' ],
 'nl' =>    [ 'Dutch',               'Nederlands',        'nl_NL', '1    ', 'iso-8859-15' ],
 'nn' =>    [ 'Norwegian Nynorsk',   'Norsk, Nynorsk',    'nn_NO', '1    ', 'iso-8859-1',  'nn:no@nynorsk:no_NY:no:nb' ],
@@ -102,8 +98,8 @@ our %langs = (
 'sk' =>    [ 'Slovak',              'Slovencina',        'sk_SK', '1    ', 'iso-8859-2' ],
 'sl' =>    [ 'Slovenian',           'Slovenscina',       'sl_SI', '1    ', 'iso-8859-2' ],
 'sq' =>    [ 'Albanian',            'Shqip',             'sq_AL', '1    ', 'iso-8859-1' ], 
-'sr' =>    [ 'Serbian Cyrillic',    'Srpska',            'sr_YU', '1    ', 'iso-8859-5',  'sp:sr' ],
-'sr@Latn' => [ 'Serbian Latin',     'Srpska',            'sr_YU', '1    ', 'iso-8859-2',  'sh:sr@Latn' ], 
+'sr' =>    [ 'Serbian Cyrillic',    'Srpska',            'sr_CS', '1    ', 'utf_cyr1', 'sp:sr' ],
+'sr@Latn' => [ 'Serbian Latin',     'Srpska',            'sr_CS', '1    ', 'unicode',  'sh:sr@Latn' ], 
 #- ss_ZA not yet done, using en_ZA locale instead
 'ss' =>    [ 'Swati',               'SiSwati',           'en_ZA', '  3  ', 'iso-8859-1', 'ss:en_ZA' ],
 'st' =>    [ 'Sotho',               'Sesotho',           'st_ZA', '  3  ', 'iso-8859-1', 'st:nso:en_ZA' ],
@@ -116,8 +112,8 @@ our %langs = (
 #-'tt' =>  [ 'Tatar',               'Tatar',             'tt_RU', ' 2   ', 'utf_cyr2' ],
 'uk' =>    [ 'Ukrainian',           'Ukrayinska',        'uk_UA', '1    ', 'koi8-u' ],
 #-'ur' =>  [ 'Urdu',                'AA Urdu',           'ur_PK', ' 2   ', 'utf_ar' ],  
-'uz' =>    [ 'Uzbek (latin)',       'Ozbekcha',          'uz_UZ', ' 2   ', 'utf_cyr2' ],
-'uz@Cyrl' => [ 'Uzbek (cyrillic)',  'Ozbekcha',          'uz_UZ', ' 2   ', 'utf_cyr2', 'uz@Cyrl:uz' ],
+'uz@Latn' => [ 'Uzbek (latin)',     'Ozbekcha',          'uz_UZ', ' 2   ', 'utf_cyr2', 'uz@Latn:uz' ],
+'uz' =>    [ 'Uzbek (cyrillic)',    'Ozbekcha',          'uz_UZ', ' 2   ', 'utf_cyr2', 'uz@Cyrl:uz' ],
 #- ve_ZA not yet done, using en_ZA locale instead
 've' =>    [ 'Venda',               'Venda',             'en_ZA', '  3  ', 'iso-8859-1', 've:ven:en_ZA' ],
 'vi' =>    [ 'Vietnamese',          'Tieng Viet',        'vi_VN', ' 2   ', 'utf_vi' ],
@@ -168,7 +164,7 @@ my %countries = (
 'AI' => [ N_("Anguilla"),       'en_US', '5' ], #
 'AL' => [ N_("Albania"),        'sq_AL', '1' ],
 'AM' => [ N_("Armenia"),        'hy_AM', '2' ],
-'AN' => [ N_("Netherlands Antilles"), 'en_US', '5' ], #
+'AN' => [ N_("Netherlands Antilles"), 'an_US', '5' ], #
 'AO' => [ N_("Angola"),         'pt_PT', '3' ], #
 'AQ' => [ N_("Antarctica"),     'en_US', '4' ], #
 'AR' => [ N_("Argentina"),      'es_AR', '5' ],
@@ -271,7 +267,7 @@ my %countries = (
 'JP' => [ N_("Japan"),          'ja_JP', '2' ],
 'KE' => [ N_("Kenya"),          'en_ZW', '3' ], #
 'KG' => [ N_("Kyrgyzstan"),     'en_US', '2' ], #
-'KH' => [ N_("Cambodia"),       'en_US', '2' ], # kh_KH not released yet
+'KH' => [ N_("Cambodia"),       'en_US', '2' ], # km_KH not released yet
 'KI' => [ N_("Kiribati"),       'en_US', '3' ], #
 'KM' => [ N_("Comoros"),        'en_US', '2' ], #
 'KN' => [ N_("Saint Kitts and Nevis"), 'en_US', '5' ], #
@@ -318,8 +314,8 @@ my %countries = (
 'NG' => [ N_("Nigeria"),        'en_US', '3' ], #
 'NI' => [ N_("Nicaragua"),      'es_NI', '5' ],
 'NL' => [ N_("Netherlands"),    'nl_NL', '1' ],
-'NO' => [ N_("Norway"),         'no_NO', '1' ],
-'NP' => [ N_("Nepal"),          'en_IN', '2' ], #
+'NO' => [ N_("Norway"),         'nb_NO', '1' ],
+'NP' => [ N_("Nepal"),          'ne_NP', '2' ],
 'NR' => [ N_("Nauru"),          'en_US', '4' ], #
 'NU' => [ N_("Niue"),           'en_US', '4' ], #
 'NZ' => [ N_("New Zealand"),    'en_NZ', '4' ],
@@ -356,7 +352,7 @@ my %countries = (
 'SL' => [ N_("Sierra Leone"),   'en_US', '3' ], #
 'SM' => [ N_("San Marino"),     'it_IT', '1' ], #
 'SN' => [ N_("Senegal"),        'fr_FR', '3' ], #
-'SO' => [ N_("Somalia"),        'en_US', '3' ], #
+'SO' => [ N_("Somalia"),        'en_US', '3' ], # so_SO
 'SR' => [ N_("Suriname"),       'nl_NL', '5' ], #
 'ST' => [ N_("Sao Tome and Principe"), 'en_US', '5' ], #
 'SV' => [ N_("El Salvador"),    'es_SV', '5' ],
@@ -379,7 +375,7 @@ my %countries = (
 'TW' => [ N_("Taiwan"),         'zh_TW', '2' ],
 'TZ' => [ N_("Tanzania"),       'en_US', '3' ], #
 'UA' => [ N_("Ukraine"),        'uk_UA', '1' ],
-'UG' => [ N_("Uganda"),         'en_US', '3' ], #
+'UG' => [ N_("Uganda"),         'en_US', '3' ], # lug_UG
 'UM' => [ N_("United States Minor Outlying Islands"), 'en_US', '5' ], #
 'US' => [ N_("United States"),  'en_US', '5' ],
 'UY' => [ N_("Uruguay"),        'es_UY', '5' ],
@@ -395,7 +391,7 @@ my %countries = (
 'WS' => [ N_("Samoa"),          'en_US', '4' ], #
 'YE' => [ N_("Yemen"),          'ar_YE', '2' ],
 'YT' => [ N_("Mayotte"),        'fr_FR', '3' ], #
-'YU' => [ N_("Serbia"),         'sp_YU', '1' ],
+'CS' => [ N_("Serbia & Montenegro"), 'sp_CS', '1' ],
 'ZA' => [ N_("South Africa"),   'en_ZA', '5' ],
 'ZM' => [ N_("Zambia"),         'en_US', '3' ], #
 'ZW' => [ N_("Zimbabwe"),       'en_ZW', '5' ],
@@ -408,10 +404,10 @@ sub list_countries {
     $options{exclude_non_installed} ? grep { -e "/usr/share/locale/".c2locale($_)."/LC_CTYPE" } @l : @l;
 }
 
-#- this list is built with 'cd /usr/share/i18n/locales ; echo ??_??'
-#- plus eo_XX ph_PH en_BE xh_ZA as_IN
-our @locales = qw(af_ZA am_ET an_ES ar_AE ar_BH ar_DZ ar_EG ar_IN ar_IQ ar_JO ar_KW ar_LB ar_LY ar_MA ar_OM ar_QA ar_SA ar_SD ar_SY ar_TN ar_YE az_AZ be_BY bg_BG bn_BD bn_IN br_FR bs_BA ca_ES cs_CZ cy_GB da_DK de_AT de_BE de_CH de_DE de_LU el_GR en_AU en_BW en_CA en_DK en_GB en_HK en_IE en_IN en_NZ en_PH en_SG en_US en_ZA en_ZW es_AR es_BO es_CL es_CO es_CR es_DO es_EC es_ES es_GT es_HN es_MX es_NI es_PA es_PE es_PR es_PY es_SV es_US es_UY es_VE et_EE eu_ES fa_IR fi_FI fo_FO fr_BE fr_CA fr_CH fr_FR fr_LU ga_IE gd_GB gl_ES gv_GB he_IL hi_IN hr_HR hu_HU hy_AM id_ID is_IS it_CH it_IT iw_IL ja_JP ka_GE kl_GL ko_KR kw_GB lo_LA lt_LT lv_LV mi_NZ mk_MK ml_IN mn_MN mr_IN ms_MY mt_MT nl_BE nl_NL nn_NO no_NO oc_FR pl_PL pt_BR pt_PT ro_RO ru_RU ru_UA se_NO sk_SK sl_SI sq_AL sr_YU st_ZA sv_FI sv_SE ta_IN te_IN tg_TJ th_TH ti_ER ti_ET tl_PH tr_TR tt_RU uk_UA ur_PK uz_UZ vi_VN wa_BE xh_ZA yi_US zh_CN zh_HK zh_SG zh_TW zu_ZA eo_XX ph_PH en_BE as_IN kn_IN);
-
+#- this list is built with the following command on the compile cluster:
+#- rpm -qpl /cooker/RPMS/locales-* | grep LC_CTYPE | cut -d'/' -f5 | grep '_' | grep -v '\.' | sort | tr '\n' ' ' ; echo
+our @locales = qw(ad_ET af_ZA am_ET an_ES ar_AE ar_BH ar_DZ ar_EG ar_IN ar_IQ ar_JO ar_KW ar_LB ar_LY ar_MA ar_OM ar_QA ar_SA ar_SD ar_SY ar_TN ar_YE as_IN az_AZ be_BY bg_BG bn_BD bn_IN br_FR bs_BA ca_ES cs_CZ cy_GB da_DK de_AT de_BE de_CH de_DE de_LU el_GR en_AU en_BE en_BW en_CA en_DK en_GB en_HK en_IE en_IN en_NZ en_PH en_SG en_US en_ZA en_ZW eo_XX es_AR es_BO es_CL es_CO es_CR es_DO es_EC es_ES es_GT es_HN es_MX es_NI es_PA es_PE es_PR es_PY es_SV es_US es_UY es_VE et_EE eu_ES fa_IR fi_FI fo_FO fr_BE fr_CA fr_CH fr_FR fr_LU ga_IE gd_GB gez_ER gez_ER@abegede gez_ET gez_ET@abegede gl_ES gu_IN gv_GB he_IL hi_IN hr_HR hu_HU hy_AM id_ID is_IS it_CH it_IT iu_CA ja_JP ka_GE kl_GL kn_IN ko_KR ku_TR kw_GB li_BE li_NL lo_LA lt_LT lv_LV mi_NZ mk_MK ml_IN mn_MN mr_IN ms_MY mt_MT nb_NO nds_DE nds_DE@traditional nds_NL ne_NP nl_BE nl_NL nn_NO oc_FR om_ET om_KE pa_IN ph_PH pl_PL pt_BR pt_PT qo_ET ro_RO ru_RU ru_UA se_NO sh_YU sid_ET sk_SK sl_SI sq_AL sr_CS sr_CS@Latn sr_YU sr_YU@Latn st_ZA sv_FI sv_SE sx_ET sz_ET ta_IN te_IN tg_TJ th_TH ti_ER ti_ET tig_ER tl_PH tr_TR tt_RU uk_UA ur_PK uz_UZ uz_UZ@Cyrl uz_UZ@Latn vi_VN wa_BE xh_ZA yi_US zh_CN zh_HK zh_SG zh_TW zu_ZA);
+	
 sub standard_locale {
     my ($lang, $country, $prefer_lang) = @_;
   retry: