From 9887fe04751edf39e8389f2c3ec3f020b5e1c17d Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 4 Jan 2001 19:34:30 +0000
Subject: keep $o->{langs} unpacked to simplify things

---
 perl-install/install_steps_interactive.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 662884334..e20992315 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} ||= substr($o->{lang}, 0, 2);
-	my $all = $o->{langs} =~ /all/;
+	$o->{langs} ||= [ $o->{lang} ];
+	my $all = member('all', @{$o->{langs}});
 	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 => lang::unpack_langs($o->{langs}),
+				values => $o->{langs},
 				sort => 1,				
 			       },
 			       { list => ['all'], label => sub { _("All") }, ref => sub { \$all }, shadow => 0 }) or goto &selectKeyboard;
-	$o->{langs} = $all ? 'all' : lang::pack_langs($l);
+	$o->{langs} = [ $all ? 'all' : $l ];
     }
     install_steps::selectKeyboard($o);
 }
-- 
cgit v1.2.1