Commit b4394e13 authored by jshin's avatar jshin Committed by Commit bot

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}
parent f42d8fc0
...@@ -529,6 +529,8 @@ base::string16 GetDisplayNameForLocale(const std::string& locale, ...@@ -529,6 +529,8 @@ base::string16 GetDisplayNameForLocale(const std::string& locale,
locale_code = "zh-Hant"; locale_code = "zh-Hant";
else if (locale_code == "tl") else if (locale_code == "tl")
locale_code = "fil"; locale_code = "fil";
else if (locale_code == "mo")
locale_code = "ro-MD";
base::string16 display_name; base::string16 display_name;
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
......
...@@ -453,6 +453,9 @@ TEST_F(L10nUtilTest, GetDisplayNameForLocale) { ...@@ -453,6 +453,9 @@ TEST_F(L10nUtilTest, GetDisplayNameForLocale) {
result = l10n_util::GetDisplayNameForLocale("es-419", "en", false); result = l10n_util::GetDisplayNameForLocale("es-419", "en", false);
EXPECT_EQ(ASCIIToUTF16("Spanish (Latin America)"), result); 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); result = l10n_util::GetDisplayNameForLocale("-BR", "en", false);
EXPECT_EQ(ASCIIToUTF16("Brazil"), result); EXPECT_EQ(ASCIIToUTF16("Brazil"), result);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment