From f5a18226b0b4b4f4f2db4982c3ac0ea1a4565cb1 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Wed, 10 Sep 2008 15:56:20 +0000
Subject: extract a "country" step out of the "language" one

---
 perl-install/standalone/finish-install | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'perl-install/standalone')

diff --git a/perl-install/standalone/finish-install b/perl-install/standalone/finish-install
index bc8295d15..72f3155f3 100755
--- a/perl-install/standalone/finish-install
+++ b/perl-install/standalone/finish-install
@@ -43,7 +43,7 @@ sub ask_language() {
 	put_in_hash($locale, lang::lang_to_ourlocale($lang));
 	lang::set($locale);
     }
-    any::selectLanguage_and_more_standalone($in, $locale);
+    any::selectLanguage_standalone($in, $locale);
     lang::write_and_install($locale, $in->do_pkgs);
 }
 
@@ -74,6 +74,13 @@ sub ask_timezone() {
     timezone::reload_sys_clock($t);
 }
 
+sub ask_country() {
+    require lang;
+    $locale ||= lang::read();
+    any::selectCountry($in, $locale);
+    lang::write_and_install($locale, $in->do_pkgs);
+}
+
 sub ask_network() {
     require network::tools;
     return if network::tools::has_network_connection();
@@ -218,6 +225,7 @@ sub call {
 }
 
 call('language');
+call('country');
 call('license');
 # "Previous" button isn't functiunnal and acts like "next" (#25349)
 $::Wizard_no_previous = 1;
-- 
cgit v1.2.1