From 98e1892f6ccd0ee539f6fa1e70461523ffcada8b Mon Sep 17 00:00:00 2001 From: zhangdd_ewan Date: Tue, 24 Sep 2024 16:05:22 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=8F=E6=84=9F?= =?UTF-8?q?=E5=9C=B0=E5=8C=BA=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangdd_ewan --- frameworks/intl/etc/region/en-Latn-US.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frameworks/intl/etc/region/en-Latn-US.xml b/frameworks/intl/etc/region/en-Latn-US.xml index b7c06fb8..52c88fe0 100644 --- a/frameworks/intl/etc/region/en-Latn-US.xml +++ b/frameworks/intl/etc/region/en-Latn-US.xml @@ -15,14 +15,14 @@ HK - Hong Kong, China + Hong Kong (China) MO - Macao, China + Macao (China) TW - Taiwan, China + Taiwan (China) \ No newline at end of file -- Gitee From ccd62b92577f98bf73b483f2e52af84af868a865 Mon Sep 17 00:00:00 2001 From: zhangdd_ewan Date: Tue, 24 Sep 2024 19:21:01 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=8F=E6=84=9F?= =?UTF-8?q?=E5=9C=B0=E5=8C=BA=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangdd_ewan --- frameworks/intl/etc/lang/en-Latn.xml | 2 +- frameworks/intl/test/unittest/locale_config_test.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frameworks/intl/etc/lang/en-Latn.xml b/frameworks/intl/etc/lang/en-Latn.xml index 31e09e96..4d4b381e 100644 --- a/frameworks/intl/etc/lang/en-Latn.xml +++ b/frameworks/intl/etc/lang/en-Latn.xml @@ -27,7 +27,7 @@ zh-Hant-HK - Traditional Chinese(Hong Kong, China) + Traditional Chinese(Hong Kong (China)) ro diff --git a/frameworks/intl/test/unittest/locale_config_test.cpp b/frameworks/intl/test/unittest/locale_config_test.cpp index 9ef95679..8cdb8215 100644 --- a/frameworks/intl/test/unittest/locale_config_test.cpp +++ b/frameworks/intl/test/unittest/locale_config_test.cpp @@ -251,7 +251,7 @@ HWTEST_F(LocaleConfigTest, LocaleConfigFuncTest009, TestSize.Level1) regionTag = "HK"; displayName = LocaleConfig::GetDisplayRegion(regionTag, localeTag, false); - EXPECT_EQ(displayName, "Hong Kong, China"); + EXPECT_EQ(displayName, "Hong Kong (China)"); } /** @@ -274,7 +274,7 @@ HWTEST_F(LocaleConfigTest, LocaleConfigFuncTest010, TestSize.Level1) languageTag = "zh-Hant-HK"; localeTag = "en-US"; displayName = LocaleConfig::GetDisplayLanguage(languageTag, localeTag, true); - EXPECT_EQ(displayName, "Traditional Chinese(Hong Kong, China)"); + EXPECT_EQ(displayName, "Traditional Chinese(Hong Kong (China))"); } /** -- Gitee From f88f695b9f93468c0a59716b9ad9d8dc00313e31 Mon Sep 17 00:00:00 2001 From: zhangdd_ewan Date: Mon, 30 Sep 2024 09:03:50 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=8F=E6=84=9F?= =?UTF-8?q?=E5=9C=B0=E5=8C=BA=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangdd_ewan --- frameworks/intl/etc/lang/bo.xml | 4 -- frameworks/intl/etc/lang/en-Latn.xml | 4 -- .../intl/etc/lang/supported_locales.xml | 1 - frameworks/intl/etc/lang/ug.xml | 4 -- frameworks/intl/etc/lang/zh-Hans.xml | 4 -- frameworks/intl/etc/lang/zh-Hant-HK.xml | 40 ------------------- frameworks/intl/etc/lang/zh-Hant.xml | 4 -- .../intl/test/unittest/locale_config_test.cpp | 6 +-- 8 files changed, 3 insertions(+), 64 deletions(-) delete mode 100644 frameworks/intl/etc/lang/zh-Hant-HK.xml diff --git a/frameworks/intl/etc/lang/bo.xml b/frameworks/intl/etc/lang/bo.xml index 9c10bcaf..6c9d553c 100644 --- a/frameworks/intl/etc/lang/bo.xml +++ b/frameworks/intl/etc/lang/bo.xml @@ -25,10 +25,6 @@ zh-Hant བརྡ་རྙིང་རྒྱ་ཡིག - - zh-Hant-HK - བརྡ་རྙིང་རྒྱ་ཡིག(ཀྲུང་གོའི་ཞང་ཀང་།) - ro རོ་མ་ནི་ཡའི་སྐད། diff --git a/frameworks/intl/etc/lang/en-Latn.xml b/frameworks/intl/etc/lang/en-Latn.xml index 4d4b381e..3021c2b3 100644 --- a/frameworks/intl/etc/lang/en-Latn.xml +++ b/frameworks/intl/etc/lang/en-Latn.xml @@ -25,10 +25,6 @@ zh-Hant Traditional Chinese - - zh-Hant-HK - Traditional Chinese(Hong Kong (China)) - ro Romanian diff --git a/frameworks/intl/etc/lang/supported_locales.xml b/frameworks/intl/etc/lang/supported_locales.xml index 1f199eab..83905f83 100644 --- a/frameworks/intl/etc/lang/supported_locales.xml +++ b/frameworks/intl/etc/lang/supported_locales.xml @@ -16,7 +16,6 @@ en-Latn zh-Hans zh-Hant - zh-Hant-HK bo ug \ No newline at end of file diff --git a/frameworks/intl/etc/lang/ug.xml b/frameworks/intl/etc/lang/ug.xml index c8281e85..f161075d 100644 --- a/frameworks/intl/etc/lang/ug.xml +++ b/frameworks/intl/etc/lang/ug.xml @@ -17,10 +17,6 @@ zh-Hant ئەنئەنىۋىي خەنزۇچە - - zh-Hant-HK - ئەنئەنىۋىي خەنزۇچە (جۇڭگو شياڭگاڭ) - ro رومىنچە diff --git a/frameworks/intl/etc/lang/zh-Hans.xml b/frameworks/intl/etc/lang/zh-Hans.xml index 2f5937cf..eac8beaf 100644 --- a/frameworks/intl/etc/lang/zh-Hans.xml +++ b/frameworks/intl/etc/lang/zh-Hans.xml @@ -25,10 +25,6 @@ zh-Hant 繁体中文 - - zh-Hant-HK - 繁体中文（中国香港） - ro 罗马尼亚文 diff --git a/frameworks/intl/etc/lang/zh-Hant-HK.xml b/frameworks/intl/etc/lang/zh-Hant-HK.xml deleted file mode 100644 index 1baf3e91..00000000 --- a/frameworks/intl/etc/lang/zh-Hant-HK.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - zh - 中文 - - - zh-Hans - 簡體中文 - - - zh-Hant - 繁體中文 - - - zh-Hant-HK - 繁體中文（中國香港） - - - ro - 羅馬尼亞文 - - - fa - 波斯文 - - \ No newline at end of file diff --git a/frameworks/intl/etc/lang/zh-Hant.xml b/frameworks/intl/etc/lang/zh-Hant.xml index 1baf3e91..97745021 100644 --- a/frameworks/intl/etc/lang/zh-Hant.xml +++ b/frameworks/intl/etc/lang/zh-Hant.xml @@ -25,10 +25,6 @@ zh-Hant 繁體中文 - - zh-Hant-HK - 繁體中文（中國香港） - ro 羅馬尼亞文 diff --git a/frameworks/intl/test/unittest/locale_config_test.cpp b/frameworks/intl/test/unittest/locale_config_test.cpp index 8cdb8215..c82acfd4 100644 --- a/frameworks/intl/test/unittest/locale_config_test.cpp +++ b/frameworks/intl/test/unittest/locale_config_test.cpp @@ -264,17 +264,17 @@ HWTEST_F(LocaleConfigTest, LocaleConfigFuncTest010, TestSize.Level1) std::string languageTag = "zh-Hant-HK"; std::string localeTag = "zh-Hant"; std::string displayName = LocaleConfig::GetDisplayLanguage(languageTag, localeTag, true); - EXPECT_EQ(displayName, "繁體中文（中國香港）"); + EXPECT_EQ(displayName, "繁體中文"); languageTag = "zh-Hant-HK"; localeTag = "zh-Hans"; displayName = LocaleConfig::GetDisplayLanguage(languageTag, localeTag, true); - EXPECT_EQ(displayName, "繁体中文（中国香港）"); + EXPECT_EQ(displayName, "繁体中文"); languageTag = "zh-Hant-HK"; localeTag = "en-US"; displayName = LocaleConfig::GetDisplayLanguage(languageTag, localeTag, true); - EXPECT_EQ(displayName, "Traditional Chinese(Hong Kong (China))"); + EXPECT_EQ(displayName, "Traditional Chinese"); } /** -- Gitee From 625afb856a8c948ac036af5f6f66724e87bba180 Mon Sep 17 00:00:00 2001 From: zhangdd_ewan Date: Tue, 8 Oct 2024 09:49:14 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=8F=E6=84=9F?= =?UTF-8?q?=E5=9C=B0=E5=8C=BA=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangdd_ewan --- frameworks/intl/BUILD.gn | 8 -------- 1 file changed, 8 deletions(-) diff --git a/frameworks/intl/BUILD.gn b/frameworks/intl/BUILD.gn index 40d13011..917f2613 100644 --- a/frameworks/intl/BUILD.gn +++ b/frameworks/intl/BUILD.gn @@ -149,7 +149,6 @@ ohos_shared_library("intl_util") { ":zh_Hans_lang_xml", ":zh_Hans_region_xml", ":zh_Hans_timezone_xml", - ":zh_Hant_HK_lang_xml", ":zh_Hant_lang_xml", ":zh_datetime_xml", ] @@ -289,13 +288,6 @@ ohos_prebuilt_etc("zh_Hant_lang_xml") { subsystem_name = "global" } -ohos_prebuilt_etc("zh_Hant_HK_lang_xml") { - source = "//base/global/i18n/frameworks/intl/etc/lang/zh-Hant-HK.xml" - module_install_dir = "etc/ohos_lang_config/" - part_name = "i18n" - subsystem_name = "global" -} - ohos_prebuilt_etc("bo_lang_xml") { source = "//base/global/i18n/frameworks/intl/etc/lang/bo.xml" module_install_dir = "etc/ohos_lang_config/" -- Gitee