Add some language aliases to track changes to base/ui/l10n_util.cc.

chrome/installer/util/language_selector.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // This file defines a helper class for selecting a supported language from a
 // set of candidates.
 
 #include "chrome/installer/util/language_selector.h"
 
 #include <algorithm>
@@ skipping 30 matching lines @@
 #undef HANDLE_LANGUAGE
 #else  // defined(GOOGLE_CHROME_BUILD)
   { &kFallbackLanguage[0], kFallbackLanguageOffset }
 #endif  // !defined(GOOGLE_CHROME_BUILD)
 };
 
 // A sorted array of language identifiers that are aliases to other languages
 // for which translations are available.
 const LangToOffset kLanguageToOffsetExceptions[] = {
 #if defined(GOOGLE_CHROME_BUILD)
+  // Alias some English variants to British English (all others wildcard to US).
+  { L"en-au", IDS_L10N_OFFSET_EN_GB },
+  { L"en-ca", IDS_L10N_OFFSET_EN_GB },
+  { L"en-nz", IDS_L10N_OFFSET_EN_GB },
+  { L"en-za", IDS_L10N_OFFSET_EN_GB },
+  // Alias es-es to es (all others wildcard to es-419).
+  { L"es-es", IDS_L10N_OFFSET_ES },
   // Google web properties use iw for he. Handle both just to be safe.
   { L"he", IDS_L10N_OFFSET_IW },
   // Google web properties use no for nb. Handle both just to be safe.
   { L"nb", IDS_L10N_OFFSET_NO },
   // Some Google web properties use tl for fil. Handle both just to be safe.
   // They're not completely identical, but alias it here.
   { L"tl", IDS_L10N_OFFSET_FIL },
   // Pre-Vista aliases for Chinese w/ script subtag.
   { L"zh-chs", IDS_L10N_OFFSET_ZH_CN },
   { L"zh-cht", IDS_L10N_OFFSET_ZH_TW },
   // Vista+ aliases for Chinese w/ script subtag.
   { L"zh-hans", IDS_L10N_OFFSET_ZH_CN },
   { L"zh-hant", IDS_L10N_OFFSET_ZH_TW },
   // Alias Macau and Hong Kong to Taiwan.
   { L"zh-hk", IDS_L10N_OFFSET_ZH_TW },
   { L"zh-mk", IDS_L10N_OFFSET_ZH_TW },

[jungshik at Google, 2011/11/29 23:35:54]

I think this line came from my 'typo' in l10n_util.cc that has since been fixed.
I guess we can't remove this line. MK is Macedonia rather than Macau.  Macau is
MO.   

[grt (UTC plus 2), 2011/12/01 14:31:11]

Thanks for spotting that.  Done.

   // Windows uses "mo" for Macau.
   { L"zh-mo", IDS_L10N_OFFSET_ZH_TW },
   // Although the wildcard entry for zh would result in this, alias zh-sg so
   // that it will win if it precedes another valid tag in a list of candidates.
   { L"zh-sg", IDS_L10N_OFFSET_ZH_CN }
 #else  // defined(GOOGLE_CHROME_BUILD)
   // An empty array is no good, so repeat the fallback.
   { &kFallbackLanguage[0], kFallbackLanguageOffset }
 #endif  // !defined(GOOGLE_CHROME_BUILD)
 };
@@ skipping 215 matching lines @@
     VLOG(1) << "No suitable language found for any candidates.";
 
     // Our fallback is "en-us"
     matched_candidate_.assign(&kFallbackLanguage[0],
                               arraysize(kFallbackLanguage) - 1);
     offset_ = kFallbackLanguageOffset;
   }
 }
 
 }  // namespace installer