!896 【5.0.1-release】敏感地区名称修改

Merge pull request !896 from zhangdd_ewan/5.0.1-release-cherry-241128

frameworks/intl/BUILD.gn

@@ -141,7 +141,6 @@ ohos_shared_library("intl_util") {
       ":config_locales_xml",
       ":dialect_languages_xml",
       ":en_Latn_lang_xml",
-      ":en_Latn_region_xml",
       ":en_datetime_xml",
       ":i18n.para",
       ":i18n.para.dac",
@@ -152,7 +151,6 @@ ohos_shared_library("intl_util") {
       ":timezones_xml",
       ":ug_lang_xml",
       ":zh_Hans_lang_xml",
-      ":zh_Hans_region_xml",
       ":zh_Hans_timezone_xml",
       ":zh_Hant_HK_lang_xml",
       ":zh_Hant_lang_xml",
@@ -344,20 +342,6 @@ ohos_prebuilt_etc("region_supported_locales_xml") {
   subsystem_name = "global"
 }
 
-ohos_prebuilt_etc("zh_Hans_region_xml") {
-  source = "//base/global/i18n/frameworks/intl/etc/region/zh-Hans.xml"
-  module_install_dir = "usr/ohos_locale_config/region/"
-  part_name = "i18n"
-  subsystem_name = "global"
-}
-
-ohos_prebuilt_etc("en_Latn_region_xml") {
-  source = "//base/global/i18n/frameworks/intl/etc/region/en-Latn-US.xml"
-  module_install_dir = "usr/ohos_locale_config/region/"
-  part_name = "i18n"
-  subsystem_name = "global"
-}
-
 ohos_prebuilt_etc("dialect_languages_xml") {
   source = "//base/global/i18n/frameworks/intl/etc/dialect_languages.xml"
   module_install_dir = "usr/ohos_locale_config/"

frameworks/intl/etc/region/en-Latn-US.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2022 Huawei Device Co., Ltd.
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<regions>
-    <region>
-        <id>HK</id>
-        <display_name>Hong Kong, China</display_name>
-    </region>
-    <region>
-        <id>MO</id>
-        <display_name>Macao, China</display_name>
-    </region>
-    <region>
-        <id>TW</id>
-        <display_name>Taiwan, China</display_name>
-    </region>
-</regions>

frameworks/intl/etc/region/supported_regions.xml

@@ -13,6 +13,4 @@
      limitations under the License.
 -->
 <supported_regions>
-    <item>en-Latn-US</item>
-    <item>zh-Hans</item>
 </supported_regions>

frameworks/intl/etc/region/zh-Hans.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2022 Huawei Device Co., Ltd.
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<regions>
-    <region>
-        <id>HK</id>
-        <display_name>中国香港</display_name>
-    </region>
-    <region>
-        <id>MO</id>
-        <display_name>中国澳门</display_name>
-    </region>
-    <region>
-        <id>TW</id>
-        <display_name>中国台湾</display_name>
-    </region>
-</regions>

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)");
 }
 
 /**