diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2006-02-23 10:54:56 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2006-02-23 10:54:56 +0000 |
| commit | 4c9864e08d1ca96728d98a224ce279edadcb7820 (patch) | |
| tree | 8fff22653510b4b70fd88e7cf536352097447b4a /perl-install | |
| parent | 4f76e9c3d00ee7fc519774a4397584c0ca5fd637 (diff) | |
| download | drakx-backup-do-not-use-4c9864e08d1ca96728d98a224ce279edadcb7820.tar drakx-backup-do-not-use-4c9864e08d1ca96728d98a224ce279edadcb7820.tar.gz drakx-backup-do-not-use-4c9864e08d1ca96728d98a224ce279edadcb7820.tar.bz2 drakx-backup-do-not-use-4c9864e08d1ca96728d98a224ce279edadcb7820.tar.xz drakx-backup-do-not-use-4c9864e08d1ca96728d98a224ce279edadcb7820.zip | |
create lang::lang_changed() to ensure {country} is set according to the lang (useful for finish-install where choosing fr gives fr_US)
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/any.pm | 4 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 4 | ||||
| -rw-r--r-- | perl-install/lang.pm | 8 |
3 files changed, 12 insertions, 4 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index 5c574ba7f..54a0cd0be 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -847,7 +847,9 @@ sub selectLanguage_and_more_standalone { local $::Wizard_no_previous = 1; my $old_lang = $locale->{lang}; selectLanguage_standalone($in, $locale); - $locale->{IM} = lang::get_default_im($locale->{lang}) if $old_lang ne $locale->{lang}; + if ($old_lang ne $locale->{lang}) { + lang::lang_changed($locale); + } undef $::Wizard_no_previous; selectCountry($in, $locale) or goto language; }; diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index dd4ab0370..ab37e3043 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -104,9 +104,7 @@ sub selectLanguage { $o->{locale}{langs} ||= { $o->{locale}{lang} => 1 }; if (!exists $o->{locale}{country}) { - my $h = lang::analyse_locale_name(lang::l2locale($o->{locale}{lang})); - $o->{locale}{country} = $h->{country} if $h->{country}; - $o->{locale}{IM} = lang::get_default_im($o->{locale}{lang}); + lang::lang_changed($o->{locale}); } lang::set($o->{locale}, !$o->isa('interactive::gtk')); diff --git a/perl-install/lang.pm b/perl-install/lang.pm index d1cde6002..15f5de647 100644 --- a/perl-install/lang.pm +++ b/perl-install/lang.pm @@ -983,6 +983,14 @@ sub system_locales_to_ourlocale { $locale; } +sub lang_changed { + my ($locale) = @_; + my $h = analyse_locale_name(l2locale($locale->{lang})); + $locale->{country} = $h->{country} if $h->{country}; + + $locale->{IM} = get_default_im($locale->{lang}); +} + sub read { my ($b_user_only) = @_; my ($f1, $f2) = ("$::prefix$ENV{HOME}/.i18n", "$::prefix/etc/sysconfig/i18n"); |