diff options
| author | jshin <jshin@chromium.org> | 2015-03-04 12:09:34 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-04 20:10:19 +0000 |
| commit | b4394e13c04a366f11d3f3903c1427ae2a977863 (patch) | |
| tree | 3a18979490949ed50e96364a9dccd7010ffd7e4f /ui/base | |
| parent | f42d8fc065c006e4590476b9526c8b5bd2563d6d (diff) | |
| download | chromium_src-b4394e13c04a366f11d3f3903c1427ae2a977863.zip chromium_src-b4394e13c04a366f11d3f3903c1427ae2a977863.tar.gz chromium_src-b4394e13c04a366f11d3f3903c1427ae2a977863.tar.bz2 | |
Roll ICU to eda9e75b to add the Windows data dll
v8 still uses the data dll (icudt.dll) on Windows.
While building the Windows data dll, a few issues were discovered in
the ICU data that were overlooked. Only one of them (the display name
for Moldovan in Moldovan) is user-visible.
ICU ( eda9e75b1fa17f57ffa369ee3543a2301b68d0a9 ) has fixes for them.
In addition, fix the display name for 'mo' (which is actually 'ro-MD')
and add a test. It's "broken" ever since ICU upgrade to 54.1. (See http://bugs.icu-project.org/trac/ticket/11563 )
BUG=428145
TEST=See https://codereview.chromium.org/878723002 for the list of
tests.
TEST=ui_base_unittests --gtest_filter=*Display*
TBR=jochen@chromium.org
Review URL: https://codereview.chromium.org/971653005
Cr-Commit-Position: refs/heads/master@{#319114}
Diffstat (limited to 'ui/base')
| -rw-r--r-- | ui/base/l10n/l10n_util.cc | 2 | ||||
| -rw-r--r-- | ui/base/l10n/l10n_util_unittest.cc | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/ui/base/l10n/l10n_util.cc b/ui/base/l10n/l10n_util.cc index 80afb84..354db4b 100644 --- a/ui/base/l10n/l10n_util.cc +++ b/ui/base/l10n/l10n_util.cc @@ -529,6 +529,8 @@ base::string16 GetDisplayNameForLocale(const std::string& locale, locale_code = "zh-Hant"; else if (locale_code == "tl") locale_code = "fil"; + else if (locale_code == "mo") + locale_code = "ro-MD"; base::string16 display_name; #if defined(OS_ANDROID) diff --git a/ui/base/l10n/l10n_util_unittest.cc b/ui/base/l10n/l10n_util_unittest.cc index 6474740..43c9ad4 100644 --- a/ui/base/l10n/l10n_util_unittest.cc +++ b/ui/base/l10n/l10n_util_unittest.cc @@ -453,6 +453,9 @@ TEST_F(L10nUtilTest, GetDisplayNameForLocale) { result = l10n_util::GetDisplayNameForLocale("es-419", "en", false); EXPECT_EQ(ASCIIToUTF16("Spanish (Latin America)"), result); + result = l10n_util::GetDisplayNameForLocale("mo", "en", false); + EXPECT_EQ(l10n_util::GetDisplayNameForLocale("ro-MD", "en", false), result); + result = l10n_util::GetDisplayNameForLocale("-BR", "en", false); EXPECT_EQ(ASCIIToUTF16("Brazil"), result); |