diff options
| -rw-r--r-- | perl-install/NEWS | 1 | ||||
| -rwxr-xr-x | perl-install/standalone/finish-install | 10 |
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; |