revert previous changes(done by accident; was going to fix local list change)

1 files changed, 37 insertions, 49 deletions

diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 7da39ee06..a084d2df2 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -465,8 +465,7 @@ sub list_countries {
 
 #- this list is built with the following command on the compile cluster:
 #- rpm -qpl /cooker/RPMS/release/locales-* | grep LC_CTYPE | egrep '/usr/share/locale/[a-z]' | cut -d'/' -f5 | sed 's/\.\(UTF-8\|ARM\|EUC\|GB.\|ISO\|KOI\|TCVN\).*\|\@\(euro\|iqtelif.*\)//' | sort -u | tr '\n' ' ';echo
-our @locales = qw(aa_DJ aa_ER aa_ER@saaho aa_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 ast_ES az_AZ be_BY be_BY@latin ber_DZ ber_MA bg_BG bn_BD bn_IN bo_CN bo_IN br_FR bs_BA byn_ER ca_AD ca_ES ca_FR ca_IT crh_UA cs_CZ csb_PL cy_GB da_DK de_AT de_BE de_CH de_DE de_LU dv_MV dz_BT el_CY el_GR en_AG en_AU en_BE en_BW en_CA en_DK en_GB en_HK en_IE en_IN en_NG en_NZ en_PH en_SG en_US en_ZA en_ZW eo_XX es@tradicional 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 fil_PH fo_FO fr_BE fr_CA fr_CH fr_FR fr_LU fur_IT fy_DE fy_NL ga_IE gd_GB gez_ER gez_ER@abegede gez_ET gez_ET@abegede gl_ES gu_IN gv_GB ha_NG he_IL hi_IN hne_IN hr_HR hsb_DE ht_HT hu_HU hy_AM id_ID ig_NG ik_CA is_IS it_CH it_IT iu_CA iw_IL ja_JP ka_GE kk_KZ kl_GL km_KH kn_IN ko_KR ks_IN ks_IN@devanagari ku_TR kw_GB ky_KG lg_UG li_BE li_NL lo_LA lt_LT lv_LV mai_IN mg_MG 
-mi_NZ mk_MK ml_IN mn_MN mr_IN ms_MY mt_MT my_MM nan_TW@latin nb_NO nds_DE nds_DE@traditional nds_NL ne_NP nl_AW nl_BE nl_NL nn_NO nr_ZA nso_ZA oc_FR om_ET om_KE or_IN pa_IN pa_PK pap_AN pl_PL ps_AF pt_BR pt_PT ro_RO ru_RU ru_UA rw_RW sa_IN sc_IT sd_IN sd_IN@devanagari se_NO shs_CA si_LK sid_ET sk_SK sl_SI so_DJ so_ET so_KE so_SO sq_AL sr_ME sr_RS sr_RS@latin ss_ZA st_ZA sv_FI sv_SE sw_XX ta_IN te_IN tg_TJ th_TH ti_ER ti_ET tig_ER tk_TM tl_PH tn_ZA tr_CY tr_TR ts_ZA tt_RU ug_CN uk_UA ur_PK uz_UZ uz_UZ@cyrillic ve_ZA vi_VN wa_BE wal_ET wo_SN xh_ZA yi_US yo_NG zh_CN zh_HK zh_SG zh_TW zu_ZA);
+our @locales = qw(aa_DJ aa_ER aa_ER@saaho aa_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 ast_ES az_AZ be_BY be_BY@latin ber_DZ ber_MA bg_BG bn_BD bn_IN bo_CN bo_IN br_FR bs_BA byn_ER ca_AD ca_ES ca_FR ca_IT crh_UA cs_CZ csb_PL cy_GB da_DK de_AT de_BE de_CH de_DE de_LU dv_MV dz_BT el_CY el_GR en_AG en_AU en_BE en_BW en_CA en_DK en_GB en_HK en_IE en_IN en_NG en_NZ en_PH en_SG en_US en_ZA en_ZW eo_XX es@tradicional 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 fil_PH fo_FO fr_BE fr_CA fr_CH fr_FR fr_LU fur_IT fy_DE fy_NL ga_IE gd_GB gez_ER gez_ER@abegede gez_ET gez_ET@abegede gl_ES gu_IN gv_GB ha_NG he_IL hi_IN hne_IN hr_HR hsb_DE ht_HT hu_HU hy_AM id_ID ig_NG ik_CA is_IS it_CH it_IT iu_CA iw_IL ja_JP ka_GE kk_KZ kl_GL km_KH kn_IN ko_KR ks_IN ks_IN@devanagari ku_TR kw_GB ky_KG lg_UG li_BE li_NL lo_LA lt_LT lv_LV mai_IN mg_MG mi_NZ mk_MK ml_IN mn_MN mr_IN ms_MY mt_MT my_MM nan_TW@latin nb_NO nds_DE nds_DE@traditional nds_NL ne_NP nl_AW nl_BE nl_NL nn_NO nr_ZA nso_ZA oc_FR om_ET om_KE or_IN pa_IN pa_PK pap_AN pl_PL ps_AF pt_BR pt_PT ro_RO ru_RU ru_UA rw_RW sa_IN sc_IT sd_IN sd_IN@devanagari se_NO shs_CA si_LK sid_ET sk_SK sl_SI so_DJ so_ET so_KE so_SO sq_AL sr_ME sr_RS sr_RS@latin ss_ZA st_ZA sv_FI sv_SE sw_XX ta_IN te_IN tg_TJ th_TH ti_ER ti_ET tig_ER tk_TM tl_PH tn_ZA tr_CY tr_TR ts_ZA tt_RU ug_CN uk_UA ur_PK uz_UZ uz_UZ@cyrillic ve_ZA vi_VN wa_BE wal_ET wo_SN xh_ZA yi_US yo_NG zh_CN zh_HK zh_SG zh_TW zu_ZA);
 	
 sub standard_locale {
     my ($lang, $country, $prefer_lang) = @_;
@@ -586,19 +585,19 @@ my ($is_kde4);
 # keep the 'packages' field in sync with share/rpmsrate:
 my %IM_config =
   (
-#   chinput => {
-#               GTK_IM_MODULE => 'xim',
-#               XIM => 'chinput',
-#               XMODIFIERS => '@im=Chinput',
-#	       XIM_PROGRAM => {
-#		   'zh_CN' => 'chinput -gb',
-#		   'en_SG' => 'chinput -gb',
-#		   'zh_HK' => 'chinput -big5',
-#		   'zh_TW' => 'chinput -big5',
-#	       },	       
-#	       langs => 'zh',
-#	       packages => { generic => sub { 'miniChinput' } },
-#              },
+   chinput => {
+               GTK_IM_MODULE => 'xim',
+               XIM => 'chinput',
+               XMODIFIERS => '@im=Chinput',
+	       XIM_PROGRAM => {
+		   'zh_CN' => 'chinput -gb',
+		   'en_SG' => 'chinput -gb',
+		   'zh_HK' => 'chinput -big5',
+		   'zh_TW' => 'chinput -big5',
+	       },	       
+	       langs => 'zh',
+	       packages => { generic => sub { 'miniChinput' } },
+              },
    fcitx => {
              GTK_IM_MODULE => 'xim',
              XIM => 'fcitx',
@@ -617,17 +616,6 @@ my %IM_config =
 		     generic => sub { qw(gcin) },
 	     },
             },
-   hime => {
-             GTK_IM_MODULE => 'hime',
-             XIM => 'hime',
-             XIM_PROGRAM => 'hime',
-             XMODIFIERS => '@im=hime',
-	     langs => 'zh',
-	     packages => {
-		     common => sub { if_($is_kde4, 'hime-qt4') },
-		     generic => sub { qw(hime) },
-	     },
-            },
    'im-ja' => {
                GTK_IM_MODULE => 'im-ja',
                QT_IM_MODULE => 'xim',
@@ -637,14 +625,14 @@ my %IM_config =
 	       langs => 'ja',
               },
 
-#   kinput2 => {   
-#               GTK_IM_MODULE => 'xim',
-#               XIM => 'kinput2',
-#               XIM_PROGRAM => 'kinput2',
-#               XMODIFIERS => '@im=kinput2',
-#	       langs => 'ja',
-#	       packages => { generic => sub { 'kinput2-wnn' } },
-#              },
+   kinput2 => {   
+               GTK_IM_MODULE => 'xim',
+               XIM => 'kinput2',
+               XIM_PROGRAM => 'kinput2',
+               XMODIFIERS => '@im=kinput2',
+	       langs => 'ja',
+	       packages => { generic => sub { 'kinput2-wnn' } },
+              },
    nabi => {
             GTK_IM_MODULE => 'xim',
             XIM => 'nabi',
@@ -653,14 +641,14 @@ my %IM_config =
 	    langs => 'ko',
            },
 
-#   oxim => {
-#       GTK_IM_MODULE => 'oxim',
-#       XIM => 'oxim',
-#       XIM_PROGRAM => 'oxim',
-#       XMODIFIERS => '@im=oxim', # '@im=SCIM' is broken for now
-#       langs => 'zh_TW',
-#       packages => { generic => sub { 'oxim' } },
-#   },
+   oxim => {
+       GTK_IM_MODULE => 'oxim',
+       XIM => 'oxim',
+       XIM_PROGRAM => 'oxim',
+       XMODIFIERS => '@im=oxim', # '@im=SCIM' is broken for now
+       langs => 'zh_TW',
+       packages => { generic => sub { 'oxim' } },
+   },
    'scim' => {
             GTK_IM_MODULE => 'scim',
 	    QT_IM_MODULE => 'xim',
@@ -716,13 +704,13 @@ my %IM_config =
 		  generic => sub { qw(uim-gtk uim) },
 	  },
           },
-#   xcin => {
-#            XIM => 'xcin',
-#            XIM_PROGRAM => 'xcin',
-#            XMODIFIERS => '@im=xcin-zh_TW',
-#            GTK_IM_MODULE => 'xim',
-#	    langs => 'zh',
-#           },
+   xcin => {
+            XIM => 'xcin',
+            XIM_PROGRAM => 'xcin',
+            XMODIFIERS => '@im=xcin-zh_TW',
+            GTK_IM_MODULE => 'xim',
+	    langs => 'zh',
+           },
    'x-unikey' => {
                   GTK_IM_MODULE => 'xim',
                   XMODIFIERS => '@im=unikey',