language/country selection change:

- first install step is selection of your language, in your language;
  it uses images for that
- language->country is probed, the selection of the country is possible
  if there was a problem, in the Summary step
- in the $o big structure, we now use $o->{locale} which contains
  three keys: lang, country and utf8
- lang.pm has been cleaned and rewritten a bit
- keyboard probing now done only on language (because this step is
  at the beginning of the install)
- timezone probing done on country, if use changes country before
  timezone in the Summary, re-probe timezone accordingly

1 files changed, 5 insertions, 6 deletions

diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 478769d8e..27ee2e42f 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -285,7 +285,7 @@ sub preConfigureTimezone {
     #- can't be done in install cuz' timeconfig %post creates funny things
     add2hash($o->{timezone}, timezone::read()) if $o->{isUpgrade};
 
-    $o->{timezone}{timezone} ||= timezone::bestTimezone(lang::lang2text($o->{lang}));
+    $o->{timezone}{timezone} ||= timezone::bestTimezone($o->{locale}{country});
 
     my $utc = every { !isFat_or_NTFS($_) } @{$o->{fstab}};
     my $ntp = timezone::ntp_server($o->{prefix});
@@ -358,7 +358,6 @@ sub setDefaultPackages {
 		$o->{compssUsersChoice}{$_} = 1 foreach 'X', 'MONITORING', 'NETWORKING_REMOTE_ACCESS_SERVER';
 	    } else {
 		$o->{compssUsersChoice}{$_} = 1 foreach 'GNOME', 'KDE', 'CONFIG', 'X';
-		$o->{lang} eq 'eu_ES' and $o->{compssUsersChoice}{KDE} = 0;
 		$o->{compssUsersChoice}{$_} = 1
 		  foreach map { @{$o->{compssUsers}{$_}{flags}} } 'Workstation|Office Workstation', 'Workstation|Internet station';
 	    }
@@ -393,15 +392,15 @@ sub setDefaultPackages {
       detect_devices::matching_desc('[nN]Vidia.*Quadro');
 
 
-    foreach (map { substr($_, 0, 2) } lang::langs($o->{langs})) {
+    foreach (lang::langs($o->{locale}{langs})) {
 	pkgs::packageByName($o->{packages}, "locales-$_") or next;
 	push @{$o->{default_packages}}, "locales-$_";
 	$o->{compssUsersChoice}{qq(LOCALES"$_")} = 1; #- mainly for zh in case of zh_TW.Big5
     }
-    foreach (lang::langsLANGUAGE($o->{langs})) {
+    foreach (lang::langsLANGUAGE($o->{locale}{langs})) {
 	$o->{compssUsersChoice}{qq(LOCALES"$_")} = 1;
     }
-    $o->{compssUsersChoice}{'CHARSET"' . lang::lang2charset($o->{lang}) . '"'} = 1;
+    $o->{compssUsersChoice}{'CHARSET"' . lang::l2charset($o->{locale}{lang}) . '"'} = 1;
 }
 
 sub unselectMostPackages {
@@ -1046,7 +1045,7 @@ sub copy_advertising {
 
     my $f;
     my $source_dir = "Mandrake/share/advertising";
-    foreach ("." . $o->{lang}, "." . substr($o->{lang},0,2), '') {
+    foreach ("." . $o->{locale}{lang}, "." . substr($o->{locale}{lang},0,2), '') {
 	$f = getFile("$source_dir$_/list") or next;
 	$source_dir = "$source_dir$_";
     }