Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3699)

Unified Diff: chrome/installer/util/language_selector.cc

Issue 8488006: Add some language aliases to track changes to base/ui/l10n_util.cc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: removed bad macau alias Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/installer/util/language_selector_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/language_selector.cc
diff --git a/chrome/installer/util/language_selector.cc b/chrome/installer/util/language_selector.cc
index d47998fa468b4dbb4c7beb7889e7fb78ac81d3d0..d7d29286617e3f9807d12f4892c8b8b2d292950f 100644
--- a/chrome/installer/util/language_selector.cc
+++ b/chrome/installer/util/language_selector.cc
@@ -48,6 +48,13 @@ const LangToOffset kLanguageOffsetPairs[] = {
// 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.
@@ -61,10 +68,8 @@ const LangToOffset kLanguageToOffsetExceptions[] = {
// 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.
+ // Alias Hong Kong and Macau to Taiwan.
{ L"zh-hk", IDS_L10N_OFFSET_ZH_TW },
- { L"zh-mk", IDS_L10N_OFFSET_ZH_TW },
- // 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.
« no previous file with comments | « no previous file | chrome/installer/util/language_selector_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698