diff options
| author | Olivier Blin <oblin@mandriva.com> | 2008-09-10 16:02:13 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2008-09-10 16:02:13 +0000 |
| commit | 1db729772f0612c1810956632318cd79e190651b (patch) | |
| tree | 578bce76faccd097effd0335721aa9a9ba652a1b | |
| parent | a499c29545a2b31071b0e9350dc61d6044de9265 (diff) | |
| download | drakx-1db729772f0612c1810956632318cd79e190651b.tar drakx-1db729772f0612c1810956632318cd79e190651b.tar.gz drakx-1db729772f0612c1810956632318cd79e190651b.tar.bz2 drakx-1db729772f0612c1810956632318cd79e190651b.tar.xz drakx-1db729772f0612c1810956632318cd79e190651b.zip | |
guess country from timezone when possible (#23303)
| -rw-r--r-- | perl-install/NEWS | 1 | ||||
| -rwxr-xr-x | perl-install/standalone/finish-install | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index b21a3f567..a4f34602b 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -6,6 +6,7 @@ - finish-install: o always ask timezone (#23303, #42368) o extract a "country" step out of the "language" one + o guess country from timezone when possible (#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 f7d100201..b7d98ae3d 100755 --- a/perl-install/standalone/finish-install +++ b/perl-install/standalone/finish-install @@ -78,6 +78,16 @@ sub ask_timezone() { sub ask_country() { require lang; $locale ||= lang::read(); + require Time::ZoneInfo; + my $zones = Time::ZoneInfo->new; + if ($timezone && $zones) { + #- guess only if timezone has been asked already + if (my $zone = $zones->current_zone) { + if (my $country_code = $zones->country($zone)) { + $locale->{country} = $country_code; + } + } + } any::selectCountry($in, $locale); lang::write_and_install($locale, $in->do_pkgs); } |