diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-05-11 14:15:57 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-05-11 14:15:57 +0000 |
| commit | cee9761947b9d85f779caab9fc45b915bc2a7fbf (patch) | |
| tree | f26454fe0b6b7de448ab97e636b91da11d801a4a | |
| parent | 9d8c7ea7404f6d15e70c2933477ebc0cdcb8ebd4 (diff) | |
| download | drakx-backup-do-not-use-cee9761947b9d85f779caab9fc45b915bc2a7fbf.tar drakx-backup-do-not-use-cee9761947b9d85f779caab9fc45b915bc2a7fbf.tar.gz drakx-backup-do-not-use-cee9761947b9d85f779caab9fc45b915bc2a7fbf.tar.bz2 drakx-backup-do-not-use-cee9761947b9d85f779caab9fc45b915bc2a7fbf.tar.xz drakx-backup-do-not-use-cee9761947b9d85f779caab9fc45b915bc2a7fbf.zip | |
selectLanguage():
- simplify @langs generation
- use a tree if @langs > 15, not when $::move is set
| -rw-r--r-- | perl-install/any.pm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index 5eff5c9b2..bd880c480 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -630,10 +630,13 @@ sub selectLanguage { my %name2l = map { lang::l2name($_) => $_ } lang::list_langs(); my $listval2val = sub { $_[0] =~ /\|(.*)/ ? $1 : $_[0] }; - my @langs = map { my $l = $_; uniq_ { $_->[0] } map { [ $::move ? $l : "$_|$l", $_, $l ] } lang::l2location($l) } lang::list_langs(); #- since gtk version will use images (function image2f) we need to sort differently my $sort_func = $using_images ? \&lang::l2transliterated : \&lang::l2name; - @langs = map { $_->[0] } sort { $sort_func->($a->[2]) cmp $sort_func->($b->[2]) } @langs; + 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; my $last_utf8 = $in->{locale}{utf8}; add2hash($common, { cancel => '', |