diff options
| author | Olivier Blin <oblin@mandriva.com> | 2008-09-10 16:13:41 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2008-09-10 16:13:41 +0000 |
| commit | 2cad2621c96beeae2b4eb9cab177f5666b0ce3c1 (patch) | |
| tree | e680b716de378754b8132e7feae8b22fff8471bc /perl-install | |
| parent | a9b968f009260d50ef128ba0ee69001efb495418 (diff) | |
| download | drakx-2cad2621c96beeae2b4eb9cab177f5666b0ce3c1.tar drakx-2cad2621c96beeae2b4eb9cab177f5666b0ce3c1.tar.gz drakx-2cad2621c96beeae2b4eb9cab177f5666b0ce3c1.tar.bz2 drakx-2cad2621c96beeae2b4eb9cab177f5666b0ce3c1.tar.xz drakx-2cad2621c96beeae2b4eb9cab177f5666b0ce3c1.zip | |
guess country from timezone without asking if COUNTRY is set to
"simplified" in the configuration file (#23303)
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rwxr-xr-x | perl-install/standalone/finish-install | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 171f4fa35..05545027e 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -8,6 +8,8 @@ o extract a "country" step out of the "language" one o guess country from timezone when possible (#23303) o call "country" and "keyboard" steps after "timezone" (#23303) + o guess country from timezone without asking if COUNTRY is set to + "simplified" in the configuration file (#23303) 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 b05ac19b0..c3d592faa 100755 --- a/perl-install/standalone/finish-install +++ b/perl-install/standalone/finish-install @@ -75,6 +75,7 @@ sub ask_timezone() { timezone::reload_sys_clock($timezone); } +#- COUNTRY=simplified: guess the country from timezone, do not ask sub ask_country() { require lang; $locale ||= lang::read(); @@ -88,7 +89,7 @@ sub ask_country() { } } } - any::selectCountry($in, $locale); + any::selectCountry($in, $locale) if lc(get_conf('COUNTRY')) ne 'simplified'; lang::write_and_install($locale, $in->do_pkgs); } |