The UI language rather than the locale is now used to pick Chrome's language ...

chrome/installer/util/l10n_string_util.cc

Index: chrome/installer/util/l10n_string_util.cc
===================================================================
--- chrome/installer/util/l10n_string_util.cc	(revision 65433)
+++ chrome/installer/util/l10n_string_util.cc	(working copy)
@@ -6,178 +6,28 @@
 // Google Chrome.
 
 #include <atlbase.h>
-#include <shlwapi.h>
 
-#include <map>
-
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
+#include "chrome/installer/util/language_selector.h"
 
-#include "google_update_settings.h"
-#include "installer_util_strings.h"
-
 namespace {
 
-// Gets the language from the OS, while taking a parameter to optionally pull
-// the language from Omaha's settings first.
-std::wstring GetSystemLanguage(const bool use_omaha_language) {
-  static std::wstring language;
-  if (!language.empty())
-    return language;
+const installer_util::LanguageSelector& GetLanguageSelector() {
+  static const installer_util::LanguageSelector instance;
 
-  if (use_omaha_language) {
-    // First try to get the language from Omaha, if one is set already.
-    GoogleUpdateSettings::GetLanguage(&language);
-    if (!language.empty())
-      return language;
-  }
-
-  // We don't have ICU at this point, so we use win32 apis.
-  LCID id = GetThreadLocale();
-  int length = GetLocaleInfo(id, LOCALE_SISO639LANGNAME, 0, 0);
-  if (0 == length) {
-    language = L"en-us";
-    return language;
-  }
-  length = GetLocaleInfo(id, LOCALE_SISO639LANGNAME,
-                         WriteInto(&language, length), length);
-  DCHECK(length == static_cast<int>(language.length() + 1));
-  StringToLowerASCII(&language);
-
-  // Add the country if we need it.
-  std::wstring country;
-  length = GetLocaleInfo(id, LOCALE_SISO3166CTRYNAME, 0, 0);
-  if (0 != length) {
-    length = GetLocaleInfo(id, LOCALE_SISO3166CTRYNAME,
-                           WriteInto(&country, length), length);
-    DCHECK(length == static_cast<int>(country.length() + 1));
-    StringToLowerASCII(&country);
-    if (L"en" == language) {
-      if (L"gb" == country) {
-        language.append(L"-gb");
-      } else {
-        language.append(L"-us");
-      }
-    } else if (L"es" == language && L"es" != country) {
-      language.append(L"-419");
-    } else if (L"pt" == language) {
-      if (L"br" == country) {
-        language.append(L"-br");
-      } else {
-        language.append(L"-pt");
-      }
-    } else if (L"zh" == language) {
-      if (L"tw" == country || L"mk" == country || L"hk" == country) {
-        language.append(L"-tw");
-      } else {
-        language.append(L"-cn");
-      }
-    }
-  }
-
-  if (language.empty())
-    language = L"en-us";
-
-  return language;
+  return instance;
 }
 
-// Gets the language from the OS.  If we're unable to get the system language,
-// defaults to en-us.
-std::wstring GetSystemLanguage() {
-  return GetSystemLanguage(false);
-}
-
-// This method returns the appropriate language offset given the language as a
-// string.  Note: This method is not thread safe because of how we create
-// |offset_map|.
-int GetLanguageOffset(const std::wstring& language) {
-  static std::map<std::wstring, int> offset_map;
-  if (offset_map.empty()) {
-#if defined(GOOGLE_CHROME_BUILD)
-    offset_map[L"ar"] = IDS_L10N_OFFSET_AR;
-    offset_map[L"bg"] = IDS_L10N_OFFSET_BG;
-    offset_map[L"bn"] = IDS_L10N_OFFSET_BN;
-    offset_map[L"ca"] = IDS_L10N_OFFSET_CA;
-    offset_map[L"cs"] = IDS_L10N_OFFSET_CS;
-    offset_map[L"da"] = IDS_L10N_OFFSET_DA;
-    offset_map[L"de"] = IDS_L10N_OFFSET_DE;
-    offset_map[L"el"] = IDS_L10N_OFFSET_EL;
-    offset_map[L"en-gb"] = IDS_L10N_OFFSET_EN_GB;
-    offset_map[L"en-us"] = IDS_L10N_OFFSET_EN_US;
-    offset_map[L"es"] = IDS_L10N_OFFSET_ES;
-    offset_map[L"es-419"] = IDS_L10N_OFFSET_ES_419;
-    offset_map[L"et"] = IDS_L10N_OFFSET_ET;
-    offset_map[L"fi"] = IDS_L10N_OFFSET_FI;
-    offset_map[L"fil"] = IDS_L10N_OFFSET_FIL;
-    offset_map[L"fr"] = IDS_L10N_OFFSET_FR;
-    offset_map[L"gu"] = IDS_L10N_OFFSET_GU;
-    offset_map[L"he"] = IDS_L10N_OFFSET_IW;
-    offset_map[L"hi"] = IDS_L10N_OFFSET_HI;
-    offset_map[L"hr"] = IDS_L10N_OFFSET_HR;
-    offset_map[L"hu"] = IDS_L10N_OFFSET_HU;
-    offset_map[L"id"] = IDS_L10N_OFFSET_ID;
-    offset_map[L"it"] = IDS_L10N_OFFSET_IT;
-    // Google web properties use iw for he. Handle both just to be safe.
-    offset_map[L"iw"] = IDS_L10N_OFFSET_IW;
-    offset_map[L"ja"] = IDS_L10N_OFFSET_JA;
-    offset_map[L"kn"] = IDS_L10N_OFFSET_KN;
-    offset_map[L"ko"] = IDS_L10N_OFFSET_KO;
-    offset_map[L"lt"] = IDS_L10N_OFFSET_LT;
-    offset_map[L"lv"] = IDS_L10N_OFFSET_LV;
-    offset_map[L"ml"] = IDS_L10N_OFFSET_ML;
-    offset_map[L"mr"] = IDS_L10N_OFFSET_MR;
-    // Google web properties use no for nb. Handle both just to be safe.
-    offset_map[L"nb"] = IDS_L10N_OFFSET_NO;
-    offset_map[L"nl"] = IDS_L10N_OFFSET_NL;
-    offset_map[L"no"] = IDS_L10N_OFFSET_NO;
-    offset_map[L"pl"] = IDS_L10N_OFFSET_PL;
-    offset_map[L"pt-br"] = IDS_L10N_OFFSET_PT_BR;
-    offset_map[L"pt-pt"] = IDS_L10N_OFFSET_PT_PT;
-    offset_map[L"ro"] = IDS_L10N_OFFSET_RO;
-    offset_map[L"ru"] = IDS_L10N_OFFSET_RU;
-    offset_map[L"sk"] = IDS_L10N_OFFSET_SK;
-    offset_map[L"sl"] = IDS_L10N_OFFSET_SL;
-    offset_map[L"sr"] = IDS_L10N_OFFSET_SR;
-    offset_map[L"sv"] = IDS_L10N_OFFSET_SV;
-    offset_map[L"ta"] = IDS_L10N_OFFSET_TA;
-    offset_map[L"te"] = IDS_L10N_OFFSET_TE;
-    offset_map[L"th"] = IDS_L10N_OFFSET_TH;
-    // Some Google web properties use tl for fil. Handle both just to be safe.
-    // They're not completely identical, but alias it here.
-    offset_map[L"tl"] = IDS_L10N_OFFSET_FIL;
-    offset_map[L"tr"] = IDS_L10N_OFFSET_TR;
-    offset_map[L"uk"] = IDS_L10N_OFFSET_UK;
-    offset_map[L"vi"] = IDS_L10N_OFFSET_VI;
-    offset_map[L"zh-cn"] = IDS_L10N_OFFSET_ZH_CN;
-    offset_map[L"zh-tw"] = IDS_L10N_OFFSET_ZH_TW;
-#else  // GOOGLE_CHROME_BUILD not defined
-    offset_map[L"en-us"] = IDS_L10N_OFFSET_EN_US;
-#endif  // if defined(GOOGLE_CHROME_BUILD)
-  }
-
-  std::map<std::wstring, int>::iterator it = offset_map.find(
-      StringToLowerASCII(language));
-  if (it != offset_map.end())
-    return it->second;
-
-#if defined(GOOGLE_CHROME_BUILD)
-  NOTREACHED() << "unknown system language-country";
-#endif  // if defined(GOOGLE_CHROME_BUILD)
-
-  // Fallback on the en-US offset just in case.
-  return IDS_L10N_OFFSET_EN_US;
-}
-
 }  // namespace
 
 namespace installer_util {
 
 std::wstring GetLocalizedString(int base_message_id) {
-  std::wstring language = GetSystemLanguage();
   std::wstring localized_string;
 
-  int message_id = base_message_id + GetLanguageOffset(language);
+  int message_id = base_message_id + GetLanguageSelector().offset();
   const ATLSTRINGRESOURCEIMAGE* image = AtlGetStringResourceImage(
       _AtlBaseModule.GetModuleInstance(), message_id);
   if (image) {
@@ -196,66 +46,22 @@
   int len = ::GetModuleFileName(NULL, full_exe_path, MAX_PATH);
   if (len == 0 || len == MAX_PATH)
     return L"";
-  std::wstring language = GetSystemLanguage(true);
-  const wchar_t* resource = L"IDR_OEMPG_EN.HTML";
 
-  static std::map<int, wchar_t*> html_map;
-  if (html_map.empty()) {
-#if defined(GOOGLE_CHROME_BUILD)
-    html_map[IDS_L10N_OFFSET_AR] = L"IDR_OEMPG_AR.HTML";
-    html_map[IDS_L10N_OFFSET_BG] = L"IDR_OEMPG_BG.HTML";
-    html_map[IDS_L10N_OFFSET_CA] = L"IDR_OEMPG_CA.HTML";
-    html_map[IDS_L10N_OFFSET_CS] = L"IDR_OEMPG_CS.HTML";
-    html_map[IDS_L10N_OFFSET_DA] = L"IDR_OEMPG_DA.HTML";
-    html_map[IDS_L10N_OFFSET_DE] = L"IDR_OEMPG_DE.HTML";
-    html_map[IDS_L10N_OFFSET_EL] = L"IDR_OEMPG_EL.HTML";
-    html_map[IDS_L10N_OFFSET_EN_US] = L"IDR_OEMPG_EN.HTML";
-    html_map[IDS_L10N_OFFSET_EN_GB] = L"IDR_OEMPG_EN_GB.HTML";
-    html_map[IDS_L10N_OFFSET_ES] = L"IDR_OEMPG_ES.HTML";
-    html_map[IDS_L10N_OFFSET_ES_419] = L"IDR_OEMPG_ES_419.HTML";
-    html_map[IDS_L10N_OFFSET_ET] = L"IDR_OEMPG_ET.HTML";
-    html_map[IDS_L10N_OFFSET_FI] = L"IDR_OEMPG_FI.HTML";
-    html_map[IDS_L10N_OFFSET_FIL] = L"IDR_OEMPG_FIL.HTML";
-    html_map[IDS_L10N_OFFSET_FR] = L"IDR_OEMPG_FR.HTML";
-    html_map[IDS_L10N_OFFSET_HI] = L"IDR_OEMPG_HI.HTML";
-    html_map[IDS_L10N_OFFSET_HR] = L"IDR_OEMPG_HR.HTML";
-    html_map[IDS_L10N_OFFSET_HU] = L"IDR_OEMPG_HU.HTML";
-    html_map[IDS_L10N_OFFSET_ID] = L"IDR_OEMPG_ID.HTML";
-    html_map[IDS_L10N_OFFSET_IT] = L"IDR_OEMPG_IT.HTML";
-    html_map[IDS_L10N_OFFSET_JA] = L"IDR_OEMPG_JA.HTML";
-    html_map[IDS_L10N_OFFSET_KO] = L"IDR_OEMPG_KO.HTML";
-    html_map[IDS_L10N_OFFSET_LT] = L"IDR_OEMPG_LT.HTML";
-    html_map[IDS_L10N_OFFSET_LV] = L"IDR_OEMPG_LV.HTML";
-    html_map[IDS_L10N_OFFSET_NL] = L"IDR_OEMPG_NL.HTML";
-    html_map[IDS_L10N_OFFSET_NO] = L"IDR_OEMPG_NO.HTML";
-    html_map[IDS_L10N_OFFSET_PL] = L"IDR_OEMPG_PL.HTML";
-    html_map[IDS_L10N_OFFSET_PT_BR] = L"IDR_OEMPG_PT_BR.HTML";
-    html_map[IDS_L10N_OFFSET_PT_PT] = L"IDR_OEMPG_PT_PT.HTML";
-    html_map[IDS_L10N_OFFSET_RO] = L"IDR_OEMPG_RO.HTML";
-    html_map[IDS_L10N_OFFSET_RU] = L"IDR_OEMPG_RU.HTML";
-    html_map[IDS_L10N_OFFSET_SK] = L"IDR_OEMPG_SK.HTML";
-    html_map[IDS_L10N_OFFSET_SL] = L"IDR_OEMPG_SL.HTML";
-    html_map[IDS_L10N_OFFSET_SR] = L"IDR_OEMPG_SR.HTML";
-    html_map[IDS_L10N_OFFSET_SV] = L"IDR_OEMPG_SV.HTML";
-    html_map[IDS_L10N_OFFSET_TH] = L"IDR_OEMPG_TH.HTML";
-    html_map[IDS_L10N_OFFSET_TR] = L"IDR_OEMPG_TR.HTML";
-    html_map[IDS_L10N_OFFSET_UK] = L"IDR_OEMPG_UK.HTML";
-    html_map[IDS_L10N_OFFSET_VI] = L"IDR_OEMPG_VI.HTML";
-    html_map[IDS_L10N_OFFSET_ZH_CN] = L"IDR_OEMPG_ZH_CN.HTML";
-    html_map[IDS_L10N_OFFSET_ZH_TW] = L"IDR_OEMPG_ZH_TW.HTML";
-#else  // GOOGLE_CHROME_BUILD not defined
-    html_map[IDS_L10N_OFFSET_EN_US] = L"IDR_OEMPG_EN.HTML";
-#endif  // if defined(GOOGLE_CHROME_BUILD)
-  }
+  // The resource names are more or less the upcased language names.
+  std::wstring language(GetLanguageSelector().selected_translation());
+  std::replace(language.begin(), language.end(), L'-', L'_');
+  StringToUpperASCII(&language);

[jungshik at Google, 2010/11/11 20:30:45]

Thanks to this change, the missing entries in the previous version of this file
(like new languages we added after version 1) are supported. Nice !

[grt (UTC plus 2), 2010/11/12 04:22:02]

Thanks.

 
-  std::map<int, wchar_t*>::iterator it = html_map.find(
-      GetLanguageOffset(language));
-  if (it != html_map.end())
-    resource = it->second;
+  std::wstring resource(L"IDR_OEMPG_");
+  resource.append(language).append(L".HTML");
 
+  // Fall back on "en" if we don't have a resource for this language.
+  if (NULL == FindResource(NULL, resource.c_str(), RT_HTML))
+    resource = L"IDR_OEMPG_EN.HTML";
+
   // Spaces and DOS paths must be url encoded.
   std::wstring url_path =
-      StringPrintf(L"res://%ls/#23/%ls", full_exe_path, resource);
+      StringPrintf(L"res://%ls/#23/%ls", full_exe_path, resource.c_str());
 
   // The cast is safe because url_path has limited length
   // (see the definition of full_exe_path and resource).