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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/base/l10n/l10n_util_unittest.cc

Issue 265613002: Roll ICU to icu52 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: update expectation in photo gallery app test Created 6 years, 6 months 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
« chrome/test/data/extensions/api_test/file_manager_browsertest/test_util.js ('K') | « ui/base/l10n/l10n_util.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/l10n/l10n_util_unittest.cc
===================================================================
--- ui/base/l10n/l10n_util_unittest.cc (revision 276469)
+++ ui/base/l10n/l10n_util_unittest.cc (working copy)
@@ -357,11 +357,16 @@
// Test zh-CN and zh-TW are treated as zh-Hans and zh-Hant.
base::string16 result =
l10n_util::GetDisplayNameForLocale("zh-CN", "en", false);
- EXPECT_EQ(ASCIIToUTF16("Chinese (Simplified Han)"), result);
+ EXPECT_EQ(ASCIIToUTF16("Chinese (Simplified)"), result);
result = l10n_util::GetDisplayNameForLocale("zh-TW", "en", false);
- EXPECT_EQ(ASCIIToUTF16("Chinese (Traditional Han)"), result);
+ EXPECT_EQ(ASCIIToUTF16("Chinese (Traditional)"), result);
+ // tl and fil are not identical to be strict, but we treat them as
+ // synonyms.
+ result = l10n_util::GetDisplayNameForLocale("tl", "en", false);
+ EXPECT_EQ(l10n_util::GetDisplayNameForLocale("fil", "en", false), result);
+
result = l10n_util::GetDisplayNameForLocale("pt-BR", "en", false);
EXPECT_EQ(ASCIIToUTF16("Portuguese (Brazil)"), result);
« chrome/test/data/extensions/api_test/file_manager_browsertest/test_util.js ('K') | « ui/base/l10n/l10n_util.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698