diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-02-24 18:10:38 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-02-24 18:10:38 +0000 |
| commit | e3b9af2efa018719c597a75e7baa116670579462 (patch) | |
| tree | fa303c5990d1c827d01077eda766a0e281844225 /perl-install/install_steps_interactive.pm | |
| parent | 5e65513637d653e2c9d3f5f121a7db348a240324 (diff) | |
| download | drakx-e3b9af2efa018719c597a75e7baa116670579462.tar drakx-e3b9af2efa018719c597a75e7baa116670579462.tar.gz drakx-e3b9af2efa018719c597a75e7baa116670579462.tar.bz2 drakx-e3b9af2efa018719c597a75e7baa116670579462.tar.xz drakx-e3b9af2efa018719c597a75e7baa116670579462.zip | |
use the langs chosen to know the keyboards to propose (and not only the main lang)
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index bffd331bb..9a34a2d77 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -189,11 +189,11 @@ For any question on this document, please contact MandrakeSoft S.A. sub selectKeyboard { my ($o, $clicked) = @_; - my $l = keyboard::lang2keyboards($o->{lang}); + my $l = keyboard::lang2keyboards(lang::langs($o->{langs})); #- good guess, don't ask return install_steps::selectKeyboard($o) - if !$::expert && !$clicked && $l->[0][1] >= 90; + if !$::expert && !$clicked && $l->[0][1] >= 90 && listlength(lang::langs($o->{langs})) == 1; my @best = map { $_->[0] } @$l; push @best, 'us_intl' if !member('us_intl', @best); |