From 33512d7f58fab6184ea1dc21930f1d00c0e382c8 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 6 Dec 2000 21:51:26 +0000
Subject: adapt to the fact that RPM_INSTALL_LANG is obsoloted. Now rpm uses
 %_install_langs in /etc/rpm/macros

---
 perl-install/install_steps_interactive.pm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'perl-install/install_steps_interactive.pm')

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);
 }
-- 
cgit v1.2.1