diff options
| author | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-01 16:15:52 +0000 |
|---|---|---|
| committer | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-01 16:15:52 +0000 |
| commit | 45132c563e520bd734f2e4bb4f627017de2d2775 (patch) | |
| tree | 36a9905e60231d6ce9cf0f582ea33cdf842d6f24 /chrome/installer/util/language_selector.cc | |
| parent | 6cef305bfaada60cecd6aea1d1a676ec60c01d4a (diff) | |
| download | chromium_src-45132c563e520bd734f2e4bb4f627017de2d2775.zip chromium_src-45132c563e520bd734f2e4bb4f627017de2d2775.tar.gz chromium_src-45132c563e520bd734f2e4bb4f627017de2d2775.tar.bz2 | |
Add some language aliases to track changes to base/ui/l10n_util.cc.
Alias Australian, Canadian, New Zealand and South African English to British English, and explicitly alias "es-es" to "es" so it doesn't become "es-419" by way of the wildcard match.
BUG=none
TEST=covered by installer_util_unittests.exe --gtest_filter=*LanguageSelectorAliasTest*
Review URL: http://codereview.chromium.org/8488006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112471 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/util/language_selector.cc')
| -rw-r--r-- | chrome/installer/util/language_selector.cc | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/chrome/installer/util/language_selector.cc b/chrome/installer/util/language_selector.cc index d47998f..9d98674 100644 --- a/chrome/installer/util/language_selector.cc +++ b/chrome/installer/util/language_selector.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. // @@ -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. |