summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgwilson@google.com <gwilson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-02 18:27:09 +0000
committergwilson@google.com <gwilson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-02 18:27:09 +0000
commit4da9faca3b8cb8687017ca4acc9c1164964062ad (patch)
tree06c78ab4b0435d0d9c85282654e4bf30cc2a3a44
parent02d8c248ec1bea0b28c4e09cf0aee2b465f34b2e (diff)
downloadchromium_src-4da9faca3b8cb8687017ca4acc9c1164964062ad.zip
chromium_src-4da9faca3b8cb8687017ca4acc9c1164964062ad.tar.gz
chromium_src-4da9faca3b8cb8687017ca4acc9c1164964062ad.tar.bz2
Modifies the way setup gets the system locale by getting the user's default locale ID instead of the thread Locale.
R=cpu,kuchhal BUG=39986 TEST=Shortcuts created on install should be in the user's default language, not system language, also see bug Review URL: http://codereview.chromium.org/1597002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43501 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/installer/util/l10n_string_util.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/installer/util/l10n_string_util.cc b/chrome/installer/util/l10n_string_util.cc
index 6be1c61..b28b459 100644
--- a/chrome/installer/util/l10n_string_util.cc
+++ b/chrome/installer/util/l10n_string_util.cc
@@ -25,7 +25,7 @@ std::wstring GetSystemLanguage() {
if (!language.empty())
return language;
// We don't have ICU at this point, so we use win32 apis.
- LCID id = GetThreadLocale();
+ LCID id = GetUserDefaultLangID();
int length = GetLocaleInfo(id, LOCALE_SISO639LANGNAME, 0, 0);
if (0 == length) {
language = L"en-us";