Dupe of http://codereview.chromium.org/238

The download page was quickly changed to address  bug 1358202, but still there's
a problem that the UI
langauge of Chrome set-up program is different from what a user choose in the
following
scenarios:

  * English is chosen on non-en-US OS
  * Hebrew is chosen on non-Hebrew OS
  * Norwegian Bokmal is selected on non-Norwegian Bokmal OS

Once these changes go in for next-point-release, the change made on the download
server can be reverted. 

1. Aliases {iw,no,tl} to {he,nb,fil}. 
2. Also map en to en-US.
3. Map {zh-HK, zh-MK, zh-SG} to {zh-TW, zh-TW, zh-CN}

This does not yet deal with other potentially problematic cases.

Added a similar change for l10n_string_util.cc for installer .

Tony already LGTM'd 238 so that I'm tbr'ing here.


BUG=1358202
TEST=L10n* unittest
TBR=tc



Review URL: http://codereview.chromium.org/260

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1800 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 1 deletions

diff --git a/chrome/installer/util/l10n_string_util.cc b/chrome/installer/util/l10n_string_util.cc
index dba8459..a7c636d 100644
--- a/chrome/installer/util/l10n_string_util.cc
+++ b/chrome/installer/util/l10n_string_util.cc
@@ -50,7 +50,7 @@ std::wstring GetSystemLanguage() {
         language.append(L"-pt");
       }
     } else if (L"zh" == language) {
-      if (L"tw" == country) {
+      if (L"tw" == country || L"mk" == country || L"hk" == country) {
         language.append(L"-tw");
       } else {
         language.append(L"-cn");
@@ -91,6 +91,8 @@ int GetLanguageOffset(const std::wstring& language) {
     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_HE;
     offset_map[L"ja"] = IDS_L10N_OFFSET_JA;
     offset_map[L"ko"] = IDS_L10N_OFFSET_KO;
     offset_map[L"lt"] = IDS_L10N_OFFSET_LT;
@@ -109,6 +111,9 @@ int GetLanguageOffset(const std::wstring& language) {
     offset_map[L"sr"] = IDS_L10N_OFFSET_SR;
     offset_map[L"sv"] = IDS_L10N_OFFSET_SV;
     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;