diff options
| author | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-23 07:07:02 +0000 |
|---|---|---|
| committer | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-23 07:07:02 +0000 |
| commit | 02e0da600ccbd1a63857b8d4291901729487d10e (patch) | |
| tree | 2efddd0e7d805e02cb7877be2697947fb51c7df3 /chrome/browser/chromeos | |
| parent | 119655003d8f225282179043e990df879062e529 (diff) | |
| download | chromium_src-02e0da600ccbd1a63857b8d4291901729487d10e.zip chromium_src-02e0da600ccbd1a63857b8d4291901729487d10e.tar.gz chromium_src-02e0da600ccbd1a63857b8d4291901729487d10e.tar.bz2 | |
Load preferred languages from user preferences.
Slowly making progress. :)
TEST=manually
BUG=chromium-os:4573
Review URL: http://codereview.chromium.org/2806060
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53443 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos')
| -rw-r--r-- | chrome/browser/chromeos/dom_ui/language_options_handler.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/dom_ui/language_options_handler.cc b/chrome/browser/chromeos/dom_ui/language_options_handler.cc index c78cccc..0a94285 100644 --- a/chrome/browser/chromeos/dom_ui/language_options_handler.cc +++ b/chrome/browser/chromeos/dom_ui/language_options_handler.cc @@ -7,6 +7,8 @@ #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/values.h" +#include "base/utf_string_conversions.h" +#include "chrome/browser/chromeos/input_method/input_method_util.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" @@ -41,4 +43,12 @@ void LanguageOptionsHandler::GetLocalizedValues( l10n_util::GetStringF( IDS_OPTIONS_SETTINGS_LANGUAGES_DISPLAY_IN_THIS_LANGUAGE, l10n_util::GetString(IDS_PRODUCT_OS_NAME))); + + // Build mappings of locale code (language code) to display name + // (ex. "en-US" => "English (United States)". + const std::vector<std::string>& locales = l10n_util::GetAvailableLocales(); + for (size_t i = 0; i < locales.size(); ++i) { + localized_strings->SetString(UTF8ToWide(locales[i]), + chromeos::input_method::GetLanguageDisplayNameFromCode(locales[i])); + } } |