summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-08-30 12:18:42 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-08-30 12:18:42 +0000
commit65f2e65947b4b5df9e7da634a9191c40e4dfb19a (patch)
tree71c81c3aa31f98fec5da96dba8b991660d4ad77c
parent5b1193227ce40240183ed1111334994256bfc3a6 (diff)
downloaddrakx-65f2e65947b4b5df9e7da634a9191c40e4dfb19a.tar
drakx-65f2e65947b4b5df9e7da634a9191c40e4dfb19a.tar.gz
drakx-65f2e65947b4b5df9e7da634a9191c40e4dfb19a.tar.bz2
drakx-65f2e65947b4b5df9e7da634a9191c40e4dfb19a.tar.xz
drakx-65f2e65947b4b5df9e7da634a9191c40e4dfb19a.zip
- set GRP_TOGGLE to '' when no GRP_TOGGLE are used
- defaults to previous GRP_TOGGLE if one is available
-rw-r--r--perl-install/any.pm16
1 files changed, 9 insertions, 7 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index cba30c7ee..dc2c5ec8c 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -1184,15 +1184,17 @@ sub config_mtools {
sub keyboard_group_toggle_choose {
my ($in, $keyboard) = @_;
- my $grp_toggles = keyboard::grp_toggles($keyboard) or return 1;
-
- my $GRP_TOGGLE =
- $in->ask_from_listf('', _("Here you can choose the key or key combination that will
+ if (my $grp_toggles = keyboard::grp_toggles($keyboard)) {
+ my $GRP_TOGGLE = $keyboard->{GRP_TOGGLE} || 'caps_toggle';
+ $GRP_TOGGLE = $in->ask_from_listf('', _("Here you can choose the key or key combination that will
allow switching between the different keyboard layouts
-(eg: latin and non latin)"), sub { $grp_toggles->{$_[0]} }, [ sort keys %$grp_toggles ], 'caps_toggle') or return;
+(eg: latin and non latin)"), sub { $grp_toggles->{$_[0]} }, [ sort keys %$grp_toggles ], $GRP_TOGGLE) or return;
- log::l("GRP_TOGGLE: $GRP_TOGGLE");
- $keyboard->{GRP_TOGGLE} = $GRP_TOGGLE;
+ log::l("GRP_TOGGLE: $GRP_TOGGLE");
+ $keyboard->{GRP_TOGGLE} = $GRP_TOGGLE;
+ } else {
+ $keyboard->{GRP_TOGGLE} = '';
+ }
1;
}