diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-07-30 08:32:44 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-07-30 08:32:44 +0000 |
| commit | 200bab7db49dff811939e818c4b6345f0f1970aa (patch) | |
| tree | a6a68892a6105d876579864415b162f89406536b /perl-install/any.pm | |
| parent | d32901566dd02bf5a368ba00f9ac583de788e5d9 (diff) | |
| download | drakx-200bab7db49dff811939e818c4b6345f0f1970aa.tar drakx-200bab7db49dff811939e818c4b6345f0f1970aa.tar.gz drakx-200bab7db49dff811939e818c4b6345f0f1970aa.tar.bz2 drakx-200bab7db49dff811939e818c4b6345f0f1970aa.tar.xz drakx-200bab7db49dff811939e818c4b6345f0f1970aa.zip | |
cleanup
Diffstat (limited to 'perl-install/any.pm')
| -rw-r--r-- | perl-install/any.pm | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index f982ae534..82d928caf 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -689,9 +689,6 @@ sub selectCountry { my ($other, $ext_country); member($country, @best) or ($ext_country, $country) = ($country, $ext_country); - my %cfg = getVarsFromSh($< ? "$::prefix$ENV{HOME}/.i18n" : "$::prefix/etc/sysconfig/i18n"); - my %ims = lang::get_ims(); - my $im = find { $ims{$_}{XIM_PROGRAM} eq $cfg{XIM_PROGRAM} } keys %ims; $in->ask_from_( { title => N("Country / Region"), messages => N("Please choose your country."), @@ -705,11 +702,10 @@ sub selectCountry { list => \@best, sort => 1 }), { val => \$ext_country, type => 'list', format => \&lang::c2name, list => [ difference2(\@countries, \@best) ], advanced => scalar(@best) }, - { val => \$im, type => 'list', label => N("Input method:"), - list => [ 'None', sort keys %ims ], advanced => 1, format => sub { uc(translate($_[0])) }, }, + { val => \$locale->{IM}, type => 'list', label => N("Input method:"), + list => [ N_("None"), sort(lang::get_ims()) ], advanced => 1, format => sub { uc(translate($_[0])) }, }, ]) or return; - $locale->{IM} = $im if ($im ne 'None'); $locale->{country} = $other || !@best ? $ext_country : $country; } |