diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-09-14 10:41:06 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-09-14 10:41:06 +0000 |
| commit | 46a9a29f5f88db3644ae8545c945012137b44503 (patch) | |
| tree | 9ac4291ded2516eb023d8134b757d2234c2dbc10 | |
| parent | bd1de62eabed65ee471c79a27c0ce7adc7c25fbf (diff) | |
| download | drakx-46a9a29f5f88db3644ae8545c945012137b44503.tar drakx-46a9a29f5f88db3644ae8545c945012137b44503.tar.gz drakx-46a9a29f5f88db3644ae8545c945012137b44503.tar.bz2 drakx-46a9a29f5f88db3644ae8545c945012137b44503.tar.xz drakx-46a9a29f5f88db3644ae8545c945012137b44503.zip | |
(selectCountry) offer to select IM if language has one preselected
(else option is only availlable in advanced mode)
| -rw-r--r-- | perl-install/any.pm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index 30436d9d5..7af5881dd 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -768,8 +768,10 @@ sub selectCountry { 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 => \$locale->{IM}, type => 'combo', label => N("Input method:"), sort => 0, + list => [ N_("None"), sort(lang::get_ims()) ], format => sub { uc(translate($_[0])) }, + advanced => !$locale->{IM} || $locale->{IM} eq 'None', + }, ]) or return; $locale->{country} = $other || !@best ? $ext_country : $country; |