summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-09-10 15:56:20 +0000
committerOlivier Blin <oblin@mandriva.com>2008-09-10 15:56:20 +0000
commitf5a18226b0b4b4f4f2db4982c3ac0ea1a4565cb1 (patch)
tree09d438275ace76a1f992d84524b24d7fd640b618 /perl-install
parent4672f0ec04a8b10612c7071cb49455690d3b11dc (diff)
downloaddrakx-f5a18226b0b4b4f4f2db4982c3ac0ea1a4565cb1.tar
drakx-f5a18226b0b4b4f4f2db4982c3ac0ea1a4565cb1.tar.gz
drakx-f5a18226b0b4b4f4f2db4982c3ac0ea1a4565cb1.tar.bz2
drakx-f5a18226b0b4b4f4f2db4982c3ac0ea1a4565cb1.tar.xz
drakx-f5a18226b0b4b4f4f2db4982c3ac0ea1a4565cb1.zip
extract a "country" step out of the "language" one
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS1
-rwxr-xr-xperl-install/standalone/finish-install10
2 files changed, 10 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 6869bf680..b21a3f567 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -5,6 +5,7 @@
- fix input devices detection in rpmsrate (broken for 3 years, #43721)
- finish-install:
o always ask timezone (#23303, #42368)
+ o extract a "country" step out of the "language" one
o behave nicely when a window manager is running (for debugging)
Version 11.38 - 8 September 2008
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;