summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-08-22 16:47:25 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-08-22 16:47:25 +0000
commita5a0d13005490f58a309d05d37d2a938aa98ef14 (patch)
tree4389f3de273510939c1b15f9c9d75436934099fb
parentb65957b3475cc1a7ab1b4cc6ca4d4b2c3692c30c (diff)
downloaddrakx-a5a0d13005490f58a309d05d37d2a938aa98ef14.tar
drakx-a5a0d13005490f58a309d05d37d2a938aa98ef14.tar.gz
drakx-a5a0d13005490f58a309d05d37d2a938aa98ef14.tar.bz2
drakx-a5a0d13005490f58a309d05d37d2a938aa98ef14.tar.xz
drakx-a5a0d13005490f58a309d05d37d2a938aa98ef14.zip
simplify (using the asumption that XKB is now always used)
-rw-r--r--perl-install/Xconfig/default.pm5
-rw-r--r--perl-install/lang.pm6
2 files changed, 4 insertions, 7 deletions
diff --git a/perl-install/Xconfig/default.pm b/perl-install/Xconfig/default.pm
index 54a27fc31..e9e4abd35 100644
--- a/perl-install/Xconfig/default.pm
+++ b/perl-install/Xconfig/default.pm
@@ -40,11 +40,6 @@ sub config_keyboard {
my $XkbLayout = keyboard::keyboard2xkb($keyboard);
- {
- my $f = "$::prefix/etc/sysconfig/i18n";
- setVarsInSh($f, add2hash_({ XKB_IN_USE => $XkbLayout ? '': 'no' }, { getVarsFromSh($f) })) if !$::testing;
- }
-
my $XkbModel =
arch() =~ /sparc/ ? 'sun' :
$XkbLayout eq 'jp' ? 'jp106' :
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index baec961b7..bf68915c9 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -666,8 +666,10 @@ sub write {
$lang or return;
- my $h = {};
- $h->{$_} = $lang foreach qw(LC_COLLATE LC_CTYPE LC_MESSAGES LC_NUMERIC LC_MONETARY LC_TIME);
+ my $h = {
+ XKB_IN_USE => '',
+ (map { $_ => $lang } qw(LC_COLLATE LC_CTYPE LC_MESSAGES LC_NUMERIC LC_MONETARY LC_TIME)),
+ };
if ($lang && exists $languages{$lang}) {
##- note: KDE is unable to use the keyboard if LC_* and LANG values differ...
#- add2hash $h, { LANG => lang2LANG($lang), LANGUAGE => lang2LANGUAGE($lang) };