From a5a0d13005490f58a309d05d37d2a938aa98ef14 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 22 Aug 2002 16:47:25 +0000
Subject: simplify (using the asumption that XKB is now always used)

---
 perl-install/Xconfig/default.pm | 5 -----
 perl-install/lang.pm            | 6 ++++--
 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) };
-- 
cgit v1.2.1