summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Saratxaga <pablo@mandriva.com>2000-10-16 11:36:44 +0000
committerPablo Saratxaga <pablo@mandriva.com>2000-10-16 11:36:44 +0000
commita237b8b8a1dcbe9ae9d4c619091aec7cd9693705 (patch)
tree9462b5ba63e396d86b7b8189fb869e687d556a24
parentfa38935bd3639e359a58e589fe0e965271c9b452 (diff)
downloaddrakx-backup-do-not-use-a237b8b8a1dcbe9ae9d4c619091aec7cd9693705.tar
drakx-backup-do-not-use-a237b8b8a1dcbe9ae9d4c619091aec7cd9693705.tar.gz
drakx-backup-do-not-use-a237b8b8a1dcbe9ae9d4c619091aec7cd9693705.tar.bz2
drakx-backup-do-not-use-a237b8b8a1dcbe9ae9d4c619091aec7cd9693705.tar.xz
drakx-backup-do-not-use-a237b8b8a1dcbe9ae9d4c619091aec7cd9693705.zip
corrected BackSpace setting
-rw-r--r--perl-install/ChangeLog4
-rw-r--r--perl-install/keyboard.pm2
-rwxr-xr-xperl-install/standalone/keyboarddrake4
3 files changed, 7 insertions, 3 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index e4e1645ed..5a8c2ac30 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,3 +1,7 @@
+2000-10-16 Pablo Saratxaga <pablo@mandrakesoft.com>
+
+ * standalone/keyboarddrake,keyboard.pm: corrected BackSpace setting
+
2000-10-10 Guillaume Cottenceau <gc@mandrakesoft.com>
* standalone/drakgw: make only one call to urpmi in order
diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index 43ae3473b..ed5a340ac 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -281,7 +281,7 @@ sub write {
setVarsInSh("$prefix/etc/sysconfig/keyboard", { KEYTABLE => keyboard2kmap($keyboard),
KBCHARSET => $charset,
- $isNotDelete ? () : (BACKSPACE => "Delete") });
+ $isNotDelete ? (BACKSPACE => "BackSpace") : (BACKSPACE => "Delete") });
run_program::rooted($prefix, "dumpkeys > /etc/sysconfig/console/default.kmap") or log::l("dumpkeys failed");
}
diff --git a/perl-install/standalone/keyboarddrake b/perl-install/standalone/keyboarddrake
index ca22c38eb..b12a3f152 100755
--- a/perl-install/standalone/keyboarddrake
+++ b/perl-install/standalone/keyboarddrake
@@ -11,7 +11,7 @@ use c;
local $_ = join '', @ARGV;
-/-h/ and die "usage: keyboarddrake [--expert]\n";
+/-h/ and die _("usage: keyboarddrake [--expert]\n");
$::expert = /-expert/;
$::isStandalone = 1;
@@ -24,7 +24,7 @@ my $keyboard = $in->ask_from_listf_(_("Keyboard"),
[ keyboard::xmodmaps() ],
keyboard::read());
-my $isNotDelete = $::expert && !$in->ask_yesorno("BackSpace", "Do you want the BackSpace to return Delete in console?", 1);
+my $isNotDelete = $::expert && !$in->ask_yesorno("BackSpace", _("Do you want the BackSpace to return Delete in console?"), 1);
my $kmap = keyboard::keyboard2kmap($keyboard);
`loadkeys $kmap`;