aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/controller
diff options
context:
space:
mode:
authorOliver Schramm <oliver.schramm97@gmail.com>2015-03-25 21:49:11 +0100
committerOliver Schramm <oliver.schramm97@gmail.com>2015-03-25 21:49:11 +0100
commit9d75f3fca8bc94fd5f3357693e1c9df3b45e3ba1 (patch)
tree5de5d8e91800a35d89f48abb85f30a31ce43f117 /phpBB/phpbb/controller
parent407b9d3c6b95ecbb85dc6b92550d3e06db721c83 (diff)
parent84d77d6cd587d8ae67e7731a00be863096336127 (diff)
downloadforums-9d75f3fca8bc94fd5f3357693e1c9df3b45e3ba1.tar
forums-9d75f3fca8bc94fd5f3357693e1c9df3b45e3ba1.tar.gz
forums-9d75f3fca8bc94fd5f3357693e1c9df3b45e3ba1.tar.bz2
forums-9d75f3fca8bc94fd5f3357693e1c9df3b45e3ba1.tar.xz
forums-9d75f3fca8bc94fd5f3357693e1c9df3b45e3ba1.zip
Merge branch '3.0.x' into 3.1.x
Diffstat (limited to 'phpBB/phpbb/controller')
0 files changed, 0 insertions, 0 deletions
label'>mode:
authorOlivier Blin <oblin@mandriva.com>2008-09-10 15:53:45 +0000
committerOlivier Blin <oblin@mandriva.com>2008-09-10 15:53:45 +0000
commit4672f0ec04a8b10612c7071cb49455690d3b11dc (patch)
tree8310618ed5c482abd8cd81fa6e50bc41b7b0baaf /perl-install/any.pm
parent7c383e05139302722f5493792a43a3b132060c8a (diff)
downloaddrakx-4672f0ec04a8b10612c7071cb49455690d3b11dc.tar
drakx-4672f0ec04a8b10612c7071cb49455690d3b11dc.tar.gz
drakx-4672f0ec04a8b10612c7071cb49455690d3b11dc.tar.bz2
drakx-4672f0ec04a8b10612c7071cb49455690d3b11dc.tar.xz
drakx-4672f0ec04a8b10612c7071cb49455690d3b11dc.zip
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
Diffstat (limited to 'perl-install/any.pm')
-rw-r--r--perl-install/any.pm4
1 files 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;
};