From 06259cc6c33d220108d68818a9cdaec8942f9552 Mon Sep 17 00:00:00 2001 From: Peter Edberg Date: Mon, 12 Sep 2022 22:56:03 -0700 Subject: [PATCH] ICU-21957 integrate CLDR release-42-beta1 to ICU main for 72 --- icu4c/source/data/locales/lo.txt | 18 +++++++++--------- icu4c/source/data/locales/th.txt | 10 +++++----- icu4c/source/data/misc/metadata.txt | 1 + icu4c/source/data/misc/supplementalData.txt | 4 ++++ icu4j/main/shared/data/icudata.jar | 4 ++-- icu4j/main/shared/data/icutzdata.jar | 2 +- icu4j/main/shared/data/testdata.jar | 2 +- tools/cldr/cldr-to-icu/pom.xml | 2 +- 8 files changed, 24 insertions(+), 19 deletions(-) diff --git a/icu4c/source/data/locales/lo.txt b/icu4c/source/data/locales/lo.txt index b04b30befdf..2a5b3bb8cf9 100644 --- a/icu4c/source/data/locales/lo.txt +++ b/icu4c/source/data/locales/lo.txt @@ -2915,23 +2915,23 @@ lo{ } } namePattern{ - givenFirst-long-addressing-formal{"{prefix} {surname}"} + givenFirst-long-addressing-formal{"{prefix}{surname}"} givenFirst-long-addressing-informal{"{given-informal}"} givenFirst-long-monogram-informal{"{given-informal-monogram-allCaps}{surname-monogram-allCaps}"} - givenFirst-long-referring-formal{"{suffix} {given} {given2} {surname}"} - givenFirst-long-referring-informal{"{given-informal} {surname}"} - givenFirst-medium-addressing-formal{"{prefix} {surname}"} + givenFirst-long-referring-formal{"{suffix}{given}{given2}{surname}"} + givenFirst-long-referring-informal{"{given-informal}{surname}"} + givenFirst-medium-addressing-formal{"{prefix}{surname}"} givenFirst-medium-addressing-informal{"{given-informal}"} givenFirst-medium-monogram-formal{"{surname-monogram-allCaps}"} givenFirst-medium-monogram-informal{"{given-informal-monogram-allCaps}"} - givenFirst-medium-referring-formal{"{suffix} {given} {given2-initial} {surname}"} - givenFirst-medium-referring-informal{"{given-informal} {surname}"} - givenFirst-short-addressing-formal{"{prefix} {surname}"} + givenFirst-medium-referring-formal{"{suffix}{given}{given2-initial}{surname}"} + givenFirst-medium-referring-informal{"{given-informal}{surname}"} + givenFirst-short-addressing-formal{"{prefix}{surname}"} givenFirst-short-addressing-informal{"{given-informal}"} givenFirst-short-monogram-formal{"{surname-monogram-allCaps}"} givenFirst-short-monogram-informal{"{given-informal-monogram-allCaps}"} - givenFirst-short-referring-formal{"{given-initial} {given2-initial} {surname}"} - givenFirst-short-referring-informal{"{given-informal} {surname-initial}"} + givenFirst-short-referring-formal{"{given-initial}{given2-initial}{surname}"} + givenFirst-short-referring-informal{"{given-informal}{surname-initial}"} sorting-long-referring-formal{"{surname-core},{given}{given2}{surname-prefix}"} sorting-long-referring-informal{"{surname},{given-informal}"} sorting-medium-referring-formal{"{surname-core},{given}{given2-initial}{surname-prefix}"} diff --git a/icu4c/source/data/locales/th.txt b/icu4c/source/data/locales/th.txt index 7a6d6f76681..a563fe395ac 100644 --- a/icu4c/source/data/locales/th.txt +++ b/icu4c/source/data/locales/th.txt @@ -3642,15 +3642,15 @@ th{ givenFirst-long-addressing-informal{"{given-informal}"} givenFirst-long-monogram-formal{"{given-informal-monogram-allCaps}"} givenFirst-long-monogram-informal{"{given-informal-monogram-allCaps}"} - givenFirst-long-referring-informal{"{given} {given2} {surname} {surname2} {suffix}"} + givenFirst-long-referring-informal{"{given}{given2}{surname}{surname2}{suffix}"} givenFirst-medium-addressing-informal{"{given-informal}"} givenFirst-medium-monogram-formal{"{given-informal-monogram-allCaps}"} givenFirst-medium-monogram-informal{"{given-informal-monogram-allCaps}"} - givenFirst-medium-referring-informal{"{given-informal} {surname}"} + givenFirst-medium-referring-informal{"{given-informal}{surname}"} givenFirst-short-addressing-informal{"{given-informal}"} - givenFirst-short-referring-informal{"{given} {given2} {surname} {surname2}"} - sorting-long-referring-formal{"{surname-core} {given} {given2} {surname-prefix}"} - sorting-long-referring-informal{"{surname} {given-informal}"} + givenFirst-short-referring-informal{"{given}{given2}{surname}{surname2}"} + sorting-long-referring-formal{"{surname-core}{given}{given2}{surname-prefix}"} + sorting-long-referring-informal{"{surname}{given-informal}"} surnameFirst-long-addressing-informal{"{given-informal}"} surnameFirst-long-monogram-formal{"{surname-monogram-allCaps}"} surnameFirst-long-monogram-informal{"{surname-monogram-allCaps}"} diff --git a/icu4c/source/data/misc/metadata.txt b/icu4c/source/data/misc/metadata.txt index 009122d1f71..af5670d55b3 100644 --- a/icu4c/source/data/misc/metadata.txt +++ b/icu4c/source/data/misc/metadata.txt @@ -5233,6 +5233,7 @@ metadata:table(nofallback){ "ee_GH", "el_GR", "en_Dsrt_US", + "en_Shaw_GB", "en_US", "eo_001", "es_ES", diff --git a/icu4c/source/data/misc/supplementalData.txt b/icu4c/source/data/misc/supplementalData.txt index 0417f0ffda3..fcc817ab1f0 100644 --- a/icu4c/source/data/misc/supplementalData.txt +++ b/icu4c/source/data/misc/supplementalData.txt @@ -17385,8 +17385,10 @@ supplementalData:table(nofallback){ secondary{ territories{ "BR", + "HR", "IT", "MX", + "SI", } } } @@ -29459,6 +29461,7 @@ supplementalData:table(nofallback){ 56422775, } vec{ + officialStatus{"official_regional"} populationShareF:int{47700000} } } @@ -32469,6 +32472,7 @@ supplementalData:table(nofallback){ 56210268, } vec{ + officialStatus{"official_regional"} populationShareF:int{48140000} } } diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar index cced080457a..454a9d06ed2 100644 --- a/icu4j/main/shared/data/icudata.jar +++ b/icu4j/main/shared/data/icudata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f7a737da8adaf76d5fa639ee143001ece1b0d6ac6b038026cba3445b78895883 -size 14172180 +oid sha256:351e9ec7313d1790c632ccd0bda7bfe0c902bf44a3b77edd6727e1f3867a7bf0 +size 14172315 diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar index 0e1bf9297ac..918a18922d1 100644 --- a/icu4j/main/shared/data/icutzdata.jar +++ b/icu4j/main/shared/data/icutzdata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ccc4e175953bb8881fdc1ff936981af0f048ec4f2efdf0162374b992828ec182 +oid sha256:5a14ed048e544ba57e9ff3d2a7424ce978ef45da895c4c75568e2809c5133403 size 93663 diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar index abc77fc7a84..5ad5c3330dc 100644 --- a/icu4j/main/shared/data/testdata.jar +++ b/icu4j/main/shared/data/testdata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aaa7001b13f1625e2ab706d3abb2ead73d1b94c7c99dca79e76d36d5ef24394c +oid sha256:e37c706605af4a3ddf8f58b3526d5d5904df5e552086d3cc6e69bef63be6048c size 831602 diff --git a/tools/cldr/cldr-to-icu/pom.xml b/tools/cldr/cldr-to-icu/pom.xml index b267ccdd838..0a7fe2cc59e 100644 --- a/tools/cldr/cldr-to-icu/pom.xml +++ b/tools/cldr/cldr-to-icu/pom.xml @@ -83,7 +83,7 @@ com.ibm.icu icu4j-for-cldr - 72.0.1-SNAPSHOT-cldr-2022-09-07 + 72.0.1-SNAPSHOT-cldr-2022-09-12