diff options
| author | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-27 05:51:09 +0000 |
|---|---|---|
| committer | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-27 05:51:09 +0000 |
| commit | ea60655b2e1be3dc53d25d1b5010178e8940a52c (patch) | |
| tree | db69ca6484b353324c84146ba8c777ecf20b9169 /chrome | |
| parent | 2a7d5ee5a46ca2ea18656de4c97b988068f7be4b (diff) | |
| download | chromium_src-ea60655b2e1be3dc53d25d1b5010178e8940a52c.zip chromium_src-ea60655b2e1be3dc53d25d1b5010178e8940a52c.tar.gz chromium_src-ea60655b2e1be3dc53d25d1b5010178e8940a52c.tar.bz2 | |
Fix a bug where we were showing a wrong language name on the OOBE screen.
The OOBE screen is by defaut shown in English, but is also shown in a
different language if "initial_locale" value is set in
/mnt/partner_partition/etc/startup_manifest.json
In this case, the default language name of the language selection menu
should be the one specified by "initial_locale". However, we were always
showing English before this fix.
BUG=chromium-os:11345
TEST=See the instruction at crosbug.com/11345
Review URL: http://codereview.chromium.org/6307015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72762 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/chromeos/login/wizard_controller.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc index 5bc99f3..9eecdab 100644 --- a/chrome/browser/chromeos/login/wizard_controller.cc +++ b/chrome/browser/chromeos/login/wizard_controller.cc @@ -964,6 +964,9 @@ void ShowLoginWizard(const std::string& first_screen_name, ResourceBundle::ReloadSharedInstance(locale); CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale; + // Set the application locale here so that the language switch + // menu works properly with the newly loaded locale. + g_browser_process->SetApplicationLocale(loaded_locale); } } } @@ -977,9 +980,6 @@ void ShowLoginWizard(const std::string& first_screen_name, chromeos::CrosLibrary::Get()->GetLoginLibrary()->EmitLoginPromptReady(); if (controller->GetCustomization()) { - if (!locale.empty()) - chromeos::LanguageSwitchMenu::SwitchLanguage(locale); - // Set initial timezone if specified by customization. const std::string timezone_name = controller->GetCustomization()->initial_timezone(); |