summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2005-03-17 16:28:21 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2005-03-17 16:28:21 +0000
commitde37de57d0f160e379bcdd0119764d8e1bca6c2e (patch)
tree5a48d0251fc0a2236dd05e933d413e49ee46f9a1
parent9903085aef52689c28ae0cf15828f520a7ec0604 (diff)
downloaddrakx-de37de57d0f160e379bcdd0119764d8e1bca6c2e.tar
drakx-de37de57d0f160e379bcdd0119764d8e1bca6c2e.tar.gz
drakx-de37de57d0f160e379bcdd0119764d8e1bca6c2e.tar.bz2
drakx-de37de57d0f160e379bcdd0119764d8e1bca6c2e.tar.xz
drakx-de37de57d0f160e379bcdd0119764d8e1bca6c2e.zip
temporary move collate sorting into net wizard in order to minimize possible side effects
-rw-r--r--perl-install/interactive.pm2
-rw-r--r--perl-install/network/netconnect.pm4
2 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm
index 6881847c7..982f7fe65 100644
--- a/perl-install/interactive.pm
+++ b/perl-install/interactive.pm
@@ -340,8 +340,6 @@ sub ask_from_normalize {
if (my $li = $e->{list}) {
ref($e->{val}) =~ /SCALAR|REF/ or internal_error($e->{val} ? "field {val} must be a reference (it is $e->{val})" : "field {val} is mandatory"); #-#
if ($e->{sort} || @$li > 10 && !exists $e->{sort}) {
- use locale;
- set_l10n_sort();
my @l2 = map { may_apply($e->{format}, $_) } @$li;
my @places = sort { $l2[$a] cmp $l2[$b] } 0 .. $#l2;
$e->{list} = $li = [ map { $li->[$_] } @places ];
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 51f4a24f0..9e52bd284 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -238,6 +238,8 @@ sub real_main {
}
};
+ use locale;
+ set_l10n_sort();
# main wizard:
my $wiz;
@@ -770,7 +772,7 @@ Take a look at http://www.linmodems.org"),
name => N("Please choose your ADSL provider"),
data => sub {
[ { label => N("Provider:"), type => "list", val => \$adsl_provider, separator => '|',
- list => [ N("Unlisted - edit manually"), keys %adsl_data ] } ];
+ list => [ sort(N("Unlisted - edit manually"), keys %adsl_data) ], sort => 0 } ];
},
post => sub {
$adsl_type = 'pppoa' if member($ntf_name, qw(bewan speedtouch));