diff options
| author | Pablo Saratxaga <pablo@mandriva.com> | 2002-03-07 17:05:23 +0000 |
|---|---|---|
| committer | Pablo Saratxaga <pablo@mandriva.com> | 2002-03-07 17:05:23 +0000 |
| commit | c6ffe55e959191dee8c95fcdf320a6af8f6aea39 (patch) | |
| tree | 34f93df5f9abe687044d2dbda74b66756e2346af | |
| parent | 572513e134388c4db1645caf687aad29622c8f9c (diff) | |
| download | drakx-backup-do-not-use-c6ffe55e959191dee8c95fcdf320a6af8f6aea39.tar drakx-backup-do-not-use-c6ffe55e959191dee8c95fcdf320a6af8f6aea39.tar.gz drakx-backup-do-not-use-c6ffe55e959191dee8c95fcdf320a6af8f6aea39.tar.bz2 drakx-backup-do-not-use-c6ffe55e959191dee8c95fcdf320a6af8f6aea39.tar.xz drakx-backup-do-not-use-c6ffe55e959191dee8c95fcdf320a6af8f6aea39.zip | |
make keyboard selection choose first the 5 first chars of lang;
then the 2 first chars;
| -rw-r--r-- | perl-install/keyboard.pm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm index 73c52142c..7306bc255 100644 --- a/perl-install/keyboard.pm +++ b/perl-install/keyboard.pm @@ -41,7 +41,6 @@ my %lang2keyboard = 'de_DE'=> 'de_nodeadkeys:70 de:50', 'de_LU'=> 'de_nodeadkeys:70 de:50 fr:40 be:35', 'el' => 'gr:90', -'el_GR'=> 'gr:90', 'en' => 'us:90 us_intl:50', 'en_US'=> 'us:90 us_intl:50', 'en_GB'=> 'uk:89 us:60 us_intl:50', @@ -336,8 +335,10 @@ sub unpack_keyboards { } map { [ split ':' ] } split ' ', $k ]; } sub lang2keyboards { - my @li = sort { $b->[1] <=> $a->[1] } map { @$_ } map { - unpack_keyboards($lang2keyboard{substr($_, 0, 5)}) || [ [ ($keyboards{$_} ? $_ : "us") => 100 ] ]; + my @li = sort { $b->[1] <=> $a->[1] } map { @$_ } map { + #- first try with the 5 first chars of LANG; if it fails try with + #- with the 2 first chars of LANG, it still not good, with "us". + unpack_keyboards($lang2keyboard{substr($_, 0, 5)}) || [ [ ($keyboards{substr($_, 0, 2)} ? $_ : "us") => 100 ] ]; } @_; \@li; } |