summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-08-09 02:17:02 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-08-09 02:17:02 +0000
commit74ae29b7a86b823c44377afc56ce0babae5bb9b7 (patch)
treed1e9b8b6c5aa48a7f7c90941024c90b6aeaeca5e
parent6ca88f08599caad1e63e101089dbc1b9c6de66f1 (diff)
downloaddrakx-74ae29b7a86b823c44377afc56ce0babae5bb9b7.tar
drakx-74ae29b7a86b823c44377afc56ce0babae5bb9b7.tar.gz
drakx-74ae29b7a86b823c44377afc56ce0babae5bb9b7.tar.bz2
drakx-74ae29b7a86b823c44377afc56ce0babae5bb9b7.tar.xz
drakx-74ae29b7a86b823c44377afc56ce0babae5bb9b7.zip
- move the "Input method:" at the end (titi did put it in the middle for OptionMenu which is crap)
- need updating the "changed" callback since there is a new entry
-rw-r--r--perl-install/any.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index d0154307f..26eec0135 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -712,14 +712,14 @@ sub selectCountry {
advanced_messages => N("Here is the full list of available countries"),
advanced_label => N("Other Countries"),
advanced_state => $ext_country && scalar(@best),
- callbacks => { changed => sub { $other = $_[0] == 1 } },
+ callbacks => { changed => sub { $_[0] != 2 and $other = $_[0] == 0 } },
},
[ if_(@best, { val => \$country, type => 'list', format => \&lang::c2name,
list => \@best, sort => 1 }),
+ { val => \$ext_country, type => 'list', format => \&lang::c2name,
+ list => [ @countries ], advanced => scalar(@best) },
{ val => \$locale->{IM}, type => 'combo', label => N("Input method:"), sort => 0,
list => [ N_("None"), sort(lang::get_ims()) ], advanced => 1, format => sub { uc(translate($_[0])) }, },
- { val => \$ext_country, type => 'list', format => \&lang::c2name,
- list => [ difference2(\@countries, \@best) ], advanced => scalar(@best) },
]) or return;
$locale->{country} = $other || !@best ? $ext_country : $country;