From bb6945d45afbbdd10163868ae8baf0e27950ae42 Mon Sep 17 00:00:00 2001 From: Markus Scherer Date: Tue, 17 Dec 2024 15:02:37 -0800 Subject: [PATCH 1/2] CLDR-16062 remove zh gb2312 & big5han collation tailorings --- common/bcp47/collation.xml | 4 ++-- common/collation/zh.xml | 14 -------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/common/bcp47/collation.xml b/common/bcp47/collation.xml index bb51229ede1..d8c29685cad 100644 --- a/common/bcp47/collation.xml +++ b/common/bcp47/collation.xml @@ -10,14 +10,14 @@ For terms of use, see http://www.unicode.org/copyright.html - + - + diff --git a/common/collation/zh.xml b/common/collation/zh.xml index 64a051749d7..860e5cd27e9 100644 --- a/common/collation/zh.xml +++ b/common/collation/zh.xml @@ -3885,13 +3885,6 @@ For terms of use, see http://www.unicode.org/copyright.html &銺<藏文/文 # Here 藏 collates as zàng/17stk/rad140, between 銺 15stk/rad167, 臓 18stk/rad130 ]]> - - - - - - Date: Tue, 17 Dec 2024 15:44:19 -0800 Subject: [PATCH 2/2] CLDR-16062 TestLocale allows deprecated ext values --- .../src/test/java/org/unicode/cldr/unittest/TestLocale.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestLocale.java b/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestLocale.java index 4849bdd9870..4e22b5611c3 100644 --- a/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestLocale.java +++ b/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestLocale.java @@ -956,9 +956,7 @@ public void testLanguageTagParserIsValid() { LstrType.extension, new AllowedMatch("ca", "islamicc"), LstrType.extension, - new AllowedMatch("co", "direct"), - LstrType.extension, - new AllowedMatch("co", "reformed"), + new AllowedMatch("co", "direct|reformed|gb2312|big5han"), LstrType.extension, new AllowedMatch("rg", "unknown"), LstrType.extension,