summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-12-06 21:51:26 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-12-06 21:51:26 +0000
commit33512d7f58fab6184ea1dc21930f1d00c0e382c8 (patch)
tree373d54a6623e73fe709aa22170ba0b1f4fe0cbd5 /perl-install/install_steps_interactive.pm
parent6f09486fa6b42c0b3fedb48d4b8dd2e6ac52c647 (diff)
downloaddrakx-33512d7f58fab6184ea1dc21930f1d00c0e382c8.tar
drakx-33512d7f58fab6184ea1dc21930f1d00c0e382c8.tar.gz
drakx-33512d7f58fab6184ea1dc21930f1d00c0e382c8.tar.bz2
drakx-33512d7f58fab6184ea1dc21930f1d00c0e382c8.tar.xz
drakx-33512d7f58fab6184ea1dc21930f1d00c0e382c8.zip
adapt to the fact that RPM_INSTALL_LANG is obsoloted. Now rpm uses %_install_langs in /etc/rpm/macros
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm10
1 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 6d48e82e1..b0b5fbd78 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -160,18 +160,18 @@ sub selectKeyboard($) {
if ($::expert && ref($o) !~ /newt/) { #- newt is buggy with big windows :-(
$o->set_help('selectLangs');
- $o->{langs} ||= [ $o->{lang} ];
- my $all = $o->{langs}[0] eq 'all';
- $o->{langs} = $o->ask_many_from_list('',
+ $o->{langs} ||= substr($o->{lang}, 0, 2);
+ my $all = $o->{langs} =~ /all/;
+ my $l = $o->ask_many_from_list('',
_("You can choose other languages that will be available after install"),
{
list => [ lang::list() ],
label => sub { lang::lang2text($_) },
- values => $o->{langs},
+ values => lang::unpack_langs($o->{langs}),
sort => 1,
},
{ list => ['all'], label => sub { _("All") }, ref => sub { \$all }, shadow => 0 }) or goto &selectKeyboard;
- $o->{langs} = [ 'all' ] if $all;
+ $o->{langs} = $all ? 'all' : lang::pack_langs($l);
}
install_steps::selectKeyboard($o);
}