summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-08-09 02:38:02 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-08-09 02:38:02 +0000
commit5fe5e4c59aa4530fdd5a427aac82265549fba86a (patch)
tree5f9e4b1d7942e62d26e9fe969d8a31d7ec300eb8
parentfc5ea7f092df3cf6f576acf8a048b465c6501604 (diff)
downloaddrakx-backup-do-not-use-5fe5e4c59aa4530fdd5a427aac82265549fba86a.tar
drakx-backup-do-not-use-5fe5e4c59aa4530fdd5a427aac82265549fba86a.tar.gz
drakx-backup-do-not-use-5fe5e4c59aa4530fdd5a427aac82265549fba86a.tar.bz2
drakx-backup-do-not-use-5fe5e4c59aa4530fdd5a427aac82265549fba86a.tar.xz
drakx-backup-do-not-use-5fe5e4c59aa4530fdd5a427aac82265549fba86a.zip
simplify (we access get_default_im with short lang name)
-rw-r--r--perl-install/lang.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index af73a1465..fec3cdb6d 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -646,13 +646,13 @@ sub get_default_im {
sub set_default_im {
my ($im, @langs) = @_;
foreach (@langs) {
- $default_im{$_}{IM} = $im foreach $_, analyse_locale_name($_)->{main};
+ $default_im{$_}{IM} = $im;
}
}
-set_default_im('x-unikey', qw(vi_VN vi_VN.TCVN vi_VN.UTF-8 vi_VN.VISCII));
+set_default_im('x-unikey', qw(vi));
# CJK default input methods:
-set_default_im('scim+(default)', qw(am ja_JP ja_JP.UTF-8 ko_KR ko_KR.UTF-8 zh_CN zh_CN.UTF-8 zh_HK zh_HK.UTF-8 zh_SG zh_SG.UTF-8 zh_TW zh_TW.UTF-8));
+set_default_im('scim+(default)', qw(am ja ko zh_CN zh_TW));
# keep the following list in sync with share/rpmsrate:
my %IM2packages = (