summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-10-08 15:08:55 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-10-08 15:08:55 +0000
commiteab9e046737849e5f5981249995e15a8881b5921 (patch)
tree3e0ff5456e7af6594080f90db1259d939dc0f491
parent6906d1421db30c08f18012ba510707bbacd9828e (diff)
downloaddrakx-kbd-mouse-x11-eab9e046737849e5f5981249995e15a8881b5921.tar
drakx-kbd-mouse-x11-eab9e046737849e5f5981249995e15a8881b5921.tar.gz
drakx-kbd-mouse-x11-eab9e046737849e5f5981249995e15a8881b5921.tar.bz2
drakx-kbd-mouse-x11-eab9e046737849e5f5981249995e15a8881b5921.tar.xz
drakx-kbd-mouse-x11-eab9e046737849e5f5981249995e15a8881b5921.zip
- display message This setting will be activated after the installation."
only during installation
-rw-r--r--NEWS3
-rw-r--r--lib/keyboard.pm4
2 files changed, 6 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 1cbb7fb..38a4818 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- display message This setting will be activated after the installation."
+ only during installation
+
Version 0.37 - 4 October 2007, by Pascal "Pixel" Rigaux
- if we probe a monitor EISA_ID but we don't have corresponding
diff --git a/lib/keyboard.pm b/lib/keyboard.pm
index 85abfbf..ca1b6ae 100644
--- a/lib/keyboard.pm
+++ b/lib/keyboard.pm
@@ -391,10 +391,12 @@ sub group_toggle_choose {
allow switching between the different keyboard layouts
(eg: latin and non latin)"), sub { translate($grp_toggles->{$_[0]}) }, [ sort keys %$grp_toggles ], $GRP_TOGGLE) or return;
- $GRP_TOGGLE ne 'rctrl_toggle' and $in->ask_warn(N("Warning"), formatAlaTeX(
+ if ($::isInstall && $GRP_TOGGLE ne 'rctrl_toggle') {
+ $in->ask_warn(N("Warning"), formatAlaTeX(
N("This setting will be activated after the installation.
During installation, you will need to use the Right Control
key to switch between the different keyboard layouts.")));
+ }
log::l("GRP_TOGGLE: $GRP_TOGGLE");
$keyboard->{GRP_TOGGLE} = $GRP_TOGGLE;
} else {