From 4672f0ec04a8b10612c7071cb49455690d3b11dc Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Wed, 10 Sep 2008 15:53:45 +0000 Subject: always call lang_changed after setting a locale (mainly to auto-update country), only affects future finish-install behavior, since selectLanguage_standalone as no other direct caller --- perl-install/any.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/perl-install/any.pm b/perl-install/any.pm index 0910fc2b7..f0c596835 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -1059,6 +1059,7 @@ when your installation is complete and you restart your system.")), sub selectLanguage_standalone { my ($in, $locale) = @_; + my $old_lang = $locale->{lang}; my $common = { messages => N("Please choose a language to use"), title => N("Language choice"), interactive_help_id => 'selectLanguage' }; @@ -1073,6 +1074,7 @@ sub selectLanguage_standalone { $locale->{utf8} = !$non_utf8; lang::set($locale); Gtk2->set_locale if $in->isa('interactive::gtk'); + lang::lang_changed($locale) if $old_lang ne $locale->{lang}; } sub selectLanguage_and_more_standalone { @@ -1082,9 +1084,7 @@ sub selectLanguage_and_more_standalone { language: # keep around previous settings so that selectLanguage can keep UTF-8 flag: local $::Wizard_no_previous = 1; - my $old_lang = $locale->{lang}; selectLanguage_standalone($in, $locale); - lang::lang_changed($locale) if $old_lang ne $locale->{lang}; undef $::Wizard_no_previous; selectCountry($in, $locale) or goto language; }; -- cgit v1.2.1