summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-10-13 13:23:24 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-10-13 13:23:24 +0000
commitf3d4982ee69b96a618f014e59edb88ab3802848c (patch)
treed94911b8020d67375c0452602f6b88847ee80048
parent5f4a141c27c595ed88bdc19523d994f135d512fb (diff)
downloaddrakx-backup-do-not-use-f3d4982ee69b96a618f014e59edb88ab3802848c.tar
drakx-backup-do-not-use-f3d4982ee69b96a618f014e59edb88ab3802848c.tar.gz
drakx-backup-do-not-use-f3d4982ee69b96a618f014e59edb88ab3802848c.tar.bz2
drakx-backup-do-not-use-f3d4982ee69b96a618f014e59edb88ab3802848c.tar.xz
drakx-backup-do-not-use-f3d4982ee69b96a618f014e59edb88ab3802848c.zip
merge pablo fix for hp: "Some KDE screens require new chinese translations
naming (zh_CN/zh_TW) to display the translations"
-rw-r--r--perl-install/lang.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index a05706914..5068cbe83 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -628,7 +628,7 @@ sub get_kde_lang {
#- get it using
#- echo C $(rpm -qp --qf "%{name}\n" /RPMS/kde-i18n-* | sed 's/kde-i18n-//')
- my @valid_kde_langs = qw(C af ar az bg bs ca cs da de el en_GB eo es et eu fa fi fr he hr hu is it ja ko lt lv mk mt nb nl nn pl pt pt_BR ro ru se sk sl sr sv ta th tr uk vi xh zh_CN.GB2312 zh_TW.Big5 zu);
+ my @valid_kde_langs = qw(C af ar az bg bs ca cs da de el en_GB eo es et eu fa fi fr he hr hu is it ja ko lt lv mk mt nb nl nn pl pt pt_BR ro ru se sk sl sr sv ta th tr uk vi xh zh_CN zh_TW zu);
my %valid_kde_langs; @valid_kde_langs{@valid_kde_langs} = ();
my $valid_lang = sub {
@@ -637,7 +637,7 @@ sub get_kde_lang {
my %fixlangs = (en => 'C', en_US => 'C',
'sr@Latn' => 'sr',
st => 'nso', ve => 'ven',
- zh_CN => 'zh_CN.GB2312', zh_SG => 'zh_CN.GB2312', zh_TW => 'zh_TW.Big5', zh_HK => 'zh_TW.Big5');
+ zh_CN => 'zh_CN', zh_SG => 'zh_CN', zh_TW => 'zh_TW', zh_HK => 'zh_TW');
exists $fixlangs{$lang} ? $fixlangs{$lang} :
exists $valid_kde_langs{$lang} ? $lang :
exists $valid_kde_langs{substr($lang, 0, 2)} ? substr($lang, 0, 2) : '';