diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-05-11 14:22:28 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-05-11 14:22:28 +0000 |
| commit | 56ba970a22b4172d90e9e8faf6cc3a22c623702e (patch) | |
| tree | d784cfd13eb06289524d0379a3032ee112401040 | |
| parent | cee9761947b9d85f779caab9fc45b915bc2a7fbf (diff) | |
| download | drakx-backup-do-not-use-56ba970a22b4172d90e9e8faf6cc3a22c623702e.tar drakx-backup-do-not-use-56ba970a22b4172d90e9e8faf6cc3a22c623702e.tar.gz drakx-backup-do-not-use-56ba970a22b4172d90e9e8faf6cc3a22c623702e.tar.bz2 drakx-backup-do-not-use-56ba970a22b4172d90e9e8faf6cc3a22c623702e.tar.xz drakx-backup-do-not-use-56ba970a22b4172d90e9e8faf6cc3a22c623702e.zip | |
more cleanup in selectLanguage()
| -rw-r--r-- | perl-install/any.pm | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index bd880c480..d3bd72065 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -623,9 +623,6 @@ sub selectLanguage { if ($::isInstall) { my $langs = $o_langs_ || {}; my $using_images = $in->isa('interactive::gtk') && !$in->{vga16}; - - #- to create the default value, use the first location for that value :/ - $lang = if_(!$::move, first(lang::l2location($lang)).'|').$lang; my %name2l = map { lang::l2name($_) => $_ } lang::list_langs(); my $listval2val = sub { $_[0] =~ /\|(.*)/ ? $1 : $_[0] }; @@ -633,10 +630,16 @@ sub selectLanguage { #- since gtk version will use images (function image2f) we need to sort differently my $sort_func = $using_images ? \&lang::l2transliterated : \&lang::l2name; my @langs = sort { $sort_func->($a) cmp $sort_func->($b) } lang::list_langs(); - @langs = map { - my $l = $_; - map { "$_|$l" } lang::l2location($l); - } @langs if @langs > 15; + if (@langs > 15) { + my $add_location = sub { + my ($l) = @_; + map { "$_|$l" } lang::l2location($l); + }; + @langs = map { $add_location->($_) } @langs; + + #- to create the default value, use the first location for that value :/ + $lang = first($add_location->($lang)); + } my $last_utf8 = $in->{locale}{utf8}; add2hash($common, { cancel => '', |