Merge "Add the missing sr-Latn into png files and rename the png locale header" am: 713d915636 am: dc235b5ab9

am: 5ec12126f0

Change-Id: Ia6b861c91958d3be23a4a7456d6d5d8e4a1607c8
(cherry picked from commit 9166f66eee)
This commit is contained in:
Tianjie Xu
2017-03-28 20:11:15 +00:00
parent 055703e26a
commit 0a599567ce
30 changed files with 43 additions and 22 deletions
+11 -10
View File
@@ -19,14 +19,15 @@
#include "minui/minui.h"
TEST(LocaleTest, Misc) {
EXPECT_TRUE(matches_locale("zh_CN", "zh_CN_#Hans"));
EXPECT_TRUE(matches_locale("zh", "zh_CN_#Hans"));
EXPECT_FALSE(matches_locale("zh_HK", "zh_CN_#Hans"));
EXPECT_TRUE(matches_locale("en_GB", "en_GB"));
EXPECT_TRUE(matches_locale("en", "en_GB"));
EXPECT_FALSE(matches_locale("en_GB", "en"));
EXPECT_FALSE(matches_locale("en_GB", "en_US"));
EXPECT_FALSE(matches_locale("en_US", ""));
// Empty locale prefix in the PNG file will match the input locale.
EXPECT_TRUE(matches_locale("", "en_US"));
EXPECT_TRUE(matches_locale("zh-CN", "zh-Hans-CN"));
EXPECT_TRUE(matches_locale("zh", "zh-Hans-CN"));
EXPECT_FALSE(matches_locale("zh-HK", "zh-Hans-CN"));
EXPECT_TRUE(matches_locale("en-GB", "en-GB"));
EXPECT_TRUE(matches_locale("en", "en-GB"));
EXPECT_FALSE(matches_locale("en-GB", "en"));
EXPECT_FALSE(matches_locale("en-GB", "en-US"));
EXPECT_FALSE(matches_locale("en-US", ""));
// Empty locale prefix in the PNG file will match the input locale.
EXPECT_TRUE(matches_locale("", "en-US"));
EXPECT_TRUE(matches_locale("sr-Latn", "sr-Latn-BA"));
}