summaryrefslogtreecommitdiffstats
path: root/perl-install/any.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-08-09 00:57:30 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-08-09 00:57:30 +0000
commit41a0161f986d891cb39c2202b835381dbd5645c2 (patch)
tree1e012187fa5a26ca178095603c6aedcd53448f5a /perl-install/any.pm
parent3bf286dc972bd75f9ca02ae6b02bbe2279443829 (diff)
downloaddrakx-41a0161f986d891cb39c2202b835381dbd5645c2.tar
drakx-41a0161f986d891cb39c2202b835381dbd5645c2.tar.gz
drakx-41a0161f986d891cb39c2202b835381dbd5645c2.tar.bz2
drakx-41a0161f986d891cb39c2202b835381dbd5645c2.tar.xz
drakx-41a0161f986d891cb39c2202b835381dbd5645c2.zip
- simplify IM choice using {format} to its full power
- {IM} is '' instead of either '' or 'None'
Diffstat (limited to 'perl-install/any.pm')
-rw-r--r--perl-install/any.pm16
1 files changed, 7 insertions, 9 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index f56831cad..4accdcdc2 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -828,9 +828,6 @@ sub selectCountry {
my ($other, $ext_country);
member($country, @best) or ($ext_country, $country) = ($country, $ext_country);
- my $format = sub { $_[0] =~ /(.*)\+(.*)/ ? "$1|$1+$2" : $_[0] };
- $locale->{IM} = $format->($locale->{IM});
-
$in->ask_from_(
{ title => N("Country / Region"),
messages => N("Please choose your country."),
@@ -844,13 +841,14 @@ 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, separator => '|', not_edit => 1,
- list => [ N_("None"), map { $format->($_) } sort(lang::get_ims()) ], format => sub { uc(translate($_[0])) },
- advanced => !$locale->{IM} || $locale->{IM} eq 'None',
- },
- ]) or return;
+ { val => \$locale->{IM}, type => 'combo', label => N("Input method:"),
+ sort => 0, separator => '|',
+ list => [ '', sort(lang::get_ims()) ],
+ format => sub { $_[0] ? uc($_[0] =~ /(.*)\+(.*)/ ? "$1|$1+$2" : $_[0]) : N("None") },
+ advanced => !$locale->{IM},
+ },
+ ]) or return;
- $locale->{IM} =~ s/.*\|//;
$locale->{country} = $other || !@best ? $ext_country : $country;
}