!803 改语言白名单配置

Merge pull request !803 from zhangdd_ewan/cherry-240819
This commit is contained in:
openharmony_ci 2024-08-27 06:23:14 +00:00 committed by Gitee
commit 3a688304fe
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 6 additions and 5 deletions

View File

@ -134,9 +134,9 @@ ohos_shared_library("intl_util") {
":common_phonenumber_xml", ":common_phonenumber_xml",
":config_locales_xml", ":config_locales_xml",
":dialect_languages_xml", ":dialect_languages_xml",
":en_Latn_lang_xml",
":en_Latn_region_xml", ":en_Latn_region_xml",
":en_datetime_xml", ":en_datetime_xml",
":en_lang_xml",
":i18n.para", ":i18n.para",
":i18n.para.dac", ":i18n.para.dac",
":i18n_param_config_xml", ":i18n_param_config_xml",
@ -316,8 +316,8 @@ ohos_prebuilt_etc("zh_Hans_timezone_xml") {
subsystem_name = "global" subsystem_name = "global"
} }
ohos_prebuilt_etc("en_lang_xml") { ohos_prebuilt_etc("en_Latn_lang_xml") {
source = "//base/global/i18n/frameworks/intl/etc/lang/en.xml" source = "//base/global/i18n/frameworks/intl/etc/lang/en-Latn.xml"
module_install_dir = "etc/ohos_lang_config/" module_install_dir = "etc/ohos_lang_config/"
part_name = "i18n" part_name = "i18n"
subsystem_name = "global" subsystem_name = "global"

View File

@ -14,7 +14,7 @@
--> -->
<i18n_param_config> <i18n_param_config>
<supported_regions>AD,AE,AF,AG,AI,AL,AM,AO,AR,AS,AT,AU,AW,AX,AZ,BA,BB,BD,BE,BF,BG,BH,BI,BJ,BL,BM,BN,BO,BQ,BR,BS,BW,BY,BZ,CA,CC,CD,CF,CG,CH,CI,CK,CL,CM,CN,CO,CR,CU,CV,CW,CX,CY,CZ,DE,DG,DJ,DK,DM,DO,DZ,EA,EC,EE,EG,ER,ES,ET,FI,FJ,FK,FM,FO,FR,GA,GB,GD,GE,GF,GG,GH,GI,GL,GM,GN,GP,GQ,GR,GT,GU,GW,GY,HK,HN,HR,HT,HU,IC,ID,IE,IL,IM,IN,IO,IQ,IR,IS,IT,JE,JM,JO,JP,KE,KG,KH,KI,KM,KN,KR,KW,KY,KZ,LA,LB,LC,LI,LK,LR,LS,LT,LU,LV,LY,MA,MC,MD,ME,MF,MG,MH,MK,ML,MM,MN,MO,MP,MQ,MR,MS,MT,MU,MV,MW,MX,MY,MZ,NA,NC,NE,NF,NG,NI,NL,NO,NP,NR,NU,NZ,OM,PA,PE,PF,PG,PH,PK,PL,PM,PN,PR,PS,PT,PW,PY,QA,RE,RO,RS,RU,RW,SA,SB,SC,SD,SE,SG,SH,SI,SJ,SK,SL,SM,SN,SO,SR,SS,ST,SV,SX,SY,SZ,TC,TD,TG,TH,TJ,TK,TL,TM,TN,TO,TR,TT,TV,TW,TZ,UA,UG,UM,US,UY,UZ,VA,VC,VE,VG,VI,VN,VU,WF,WS,YE,YT,ZA,ZM,ZW</supported_regions> <supported_regions>AD,AE,AF,AG,AI,AL,AM,AO,AR,AS,AT,AU,AW,AX,AZ,BA,BB,BD,BE,BF,BG,BH,BI,BJ,BL,BM,BN,BO,BQ,BR,BS,BW,BY,BZ,CA,CC,CD,CF,CG,CH,CI,CK,CL,CM,CN,CO,CR,CU,CV,CW,CX,CY,CZ,DE,DG,DJ,DK,DM,DO,DZ,EA,EC,EE,EG,ER,ES,ET,FI,FJ,FK,FM,FO,FR,GA,GB,GD,GE,GF,GG,GH,GI,GL,GM,GN,GP,GQ,GR,GT,GU,GW,GY,HK,HN,HR,HT,HU,IC,ID,IE,IL,IM,IN,IO,IQ,IR,IS,IT,JE,JM,JO,JP,KE,KG,KH,KI,KM,KN,KR,KW,KY,KZ,LA,LB,LC,LI,LK,LR,LS,LT,LU,LV,LY,MA,MC,MD,ME,MF,MG,MH,MK,ML,MM,MN,MO,MP,MQ,MR,MS,MT,MU,MV,MW,MX,MY,MZ,NA,NC,NE,NF,NG,NI,NL,NO,NP,NR,NU,NZ,OM,PA,PE,PF,PG,PH,PK,PL,PM,PN,PR,PS,PT,PW,PY,QA,RE,RO,RS,RU,RW,SA,SB,SC,SD,SE,SG,SH,SI,SJ,SK,SL,SM,SN,SO,SR,SS,ST,SV,SX,SY,SZ,TC,TD,TG,TH,TJ,TK,TL,TM,TN,TO,TR,TT,TV,TW,TZ,UA,UG,UM,US,UY,UZ,VA,VC,VE,VG,VI,VN,VU,WF,WS,YE,YT,ZA,ZM,ZW</supported_regions>
<white_languages>zh-Hans,en,zh-Hant,zh-Hant-HK,bo,ug</white_languages> <white_languages>zh-Hans,en-Latn-US,zh-Hant,zh-Hant-HK,bo,ug</white_languages>
<forbidden_regions></forbidden_regions> <forbidden_regions></forbidden_regions>
<forbidden_languages></forbidden_languages> <forbidden_languages></forbidden_languages>
</i18n_param_config> </i18n_param_config>

View File

@ -13,7 +13,7 @@
limitations under the License. limitations under the License.
--> -->
<supported_locales> <supported_locales>
<item>en</item> <item>en-Latn</item>
<item>zh-Hans</item> <item>zh-Hans</item>
<item>zh-Hant</item> <item>zh-Hant</item>
<item>zh-Hant-HK</item> <item>zh-Hant-HK</item>

View File

@ -215,6 +215,7 @@ static unordered_map<string, string> g_languageMap = {
{ "es-Latn-US", "es-419" }, { "es-Latn-US", "es-419" },
{ "az-Latn", "az-Latn" }, { "az-Latn", "az-Latn" },
{ "bs-Latn", "bs-Latn" }, { "bs-Latn", "bs-Latn" },
{ "en-Latn-US", "en" },
{ "en-Qaag", "en-Qaag" }, { "en-Qaag", "en-Qaag" },
{ "uz-Latn", "uz-Latn" }, { "uz-Latn", "uz-Latn" },
{ "sr-Latn", "sr-Latn" }, { "sr-Latn", "sr-Latn" },