summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-09-09 09:40:54 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-09-09 09:40:54 +0000
commit8da7f216a683fa46c77ffb55906cf1b88b0b57e4 (patch)
treea5f0561f1118cb726407381b308bfbb60a700ede
parent6670987d970b106d7c4bca78b8c6fa0136e17cc6 (diff)
downloaddrakx-backup-do-not-use-8da7f216a683fa46c77ffb55906cf1b88b0b57e4.tar
drakx-backup-do-not-use-8da7f216a683fa46c77ffb55906cf1b88b0b57e4.tar.gz
drakx-backup-do-not-use-8da7f216a683fa46c77ffb55906cf1b88b0b57e4.tar.bz2
drakx-backup-do-not-use-8da7f216a683fa46c77ffb55906cf1b88b0b57e4.tar.xz
drakx-backup-do-not-use-8da7f216a683fa46c77ffb55906cf1b88b0b57e4.zip
fix ENC and locale specific stuff even when IM is disabled (because of thai)
-rw-r--r--perl-install/lang.pm8
1 files changed, 5 insertions, 3 deletions
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index b4d7746d0..74a933ce3 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -588,6 +588,7 @@ my %locale2encoding = (
'ja_JP' => 'eucj',
'ko_KR' => 'kr',
'zh_CN' => 'gb',
+ # zh_SG zh_HK were reported as missing by make check:
'zh_HK' => 'big5',
'zh_SG' => 'gb',
'zh_TW' => 'big5',
@@ -1016,14 +1017,15 @@ sub write {
}
+ add2hash($h, $IM_locale_specific_config{$locale->{lang}});
+ $h->{ENC} = $locale2encoding{$locale->{lang}};
+ $h->{ENC} = 'utf8' if member($locale->{lang}, qw(ja_JP.UTF-8 ko_KR.UTF-8 zh_CN.UTF-8 zh_HK.UTF-8 zh_SG.UTF-8 zh_TW.UTF-8));
+
my $im = $locale->{IM};
if ($im && $im ne 'None') {
log::explanations(qq(Configuring "$im" IM));
delete @$h{qw(GTK_IM_MODULE QT_IM_MODULE XIM XIM_PROGRAM XMODIFIERS)};
add2hash($h, { XIM_PROGRAM => $IM_XIM_program{$im}{$h->{LC_NAME}} });
- add2hash($h, $IM_locale_specific_config{$locale->{lang}});
- $h->{ENC} = $locale2encoding{$locale->{lang}};
- $h->{ENC} = 'utf8' if member($locale->{lang}, qw(ja_JP.UTF-8 ko_KR.UTF-8 zh_CN.UTF-8 zh_HK.UTF-8 zh_SG.UTF-8 zh_TW.UTF-8));
add2hash($h, $IM_config{$locale->{IM}});
$h->{QT_IM_MODULE} = $h->{GTK_IM_MODULE} if $h->{GTK_IM_MODULE};