summaryrefslogtreecommitdiffstats
path: root/perl-install/lang.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-08-09 00:57:30 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-08-09 00:57:30 +0000
commit41a0161f986d891cb39c2202b835381dbd5645c2 (patch)
tree1e012187fa5a26ca178095603c6aedcd53448f5a /perl-install/lang.pm
parent3bf286dc972bd75f9ca02ae6b02bbe2279443829 (diff)
downloaddrakx-backup-do-not-use-41a0161f986d891cb39c2202b835381dbd5645c2.tar
drakx-backup-do-not-use-41a0161f986d891cb39c2202b835381dbd5645c2.tar.gz
drakx-backup-do-not-use-41a0161f986d891cb39c2202b835381dbd5645c2.tar.bz2
drakx-backup-do-not-use-41a0161f986d891cb39c2202b835381dbd5645c2.tar.xz
drakx-backup-do-not-use-41a0161f986d891cb39c2202b835381dbd5645c2.zip
- simplify IM choice using {format} to its full power
- {IM} is '' instead of either '' or 'None'
Diffstat (limited to 'perl-install/lang.pm')
-rw-r--r--perl-install/lang.pm12
1 files changed, 5 insertions, 7 deletions
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index ced60d996..d7de73cce 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -681,14 +681,12 @@ my %IM2packages = (
sub IM2packages {
my ($locale) = @_;
- my $im = $locale->{IM};
- if ($im eq "None") {
- ();
- } else {
+ if ($locale->{IM}) {
+ my $per_lang = $IM2packages{$locale->{IM}} || {};
my $lang = analyse_locale_name($locale->{lang})->{main};
- my $l = $IM2packages{$im}{$lang} || $IM2packages{$im}{generic} || [ $im ];
+ my $l = $per_lang->{$lang} || $per_lang->{generic} || [ $locale->{IM} ];
@$l;
- }
+ } else { () }
}
# enable to select extra SCIM combinaisons:
@@ -1069,7 +1067,7 @@ sub write {
$h->{ENC} = 'utf8' if member($h->{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') {
+ if ($im) {
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}} });