From ae4dede25d584916d795e68890e5d3ed764ecfd0 Mon Sep 17 00:00:00 2001 From: Annemarie Apple Date: Thu, 8 May 2025 05:11:36 +0000 Subject: [PATCH 1/4] CLDR-18620 Investigate and add en-419 child locales See #4687 --- common/en_CO.xml | 381 ++++++++++++++++++++++++++++++++++++++++++ common/main/en_MX.xml | 24 +++ 2 files changed, 405 insertions(+) create mode 100644 common/en_CO.xml create mode 100644 common/main/en_MX.xml diff --git a/common/en_CO.xml b/common/en_CO.xml new file mode 100644 index 00000000000..fa10732dc56 --- /dev/null +++ b/common/en_CO.xml @@ -0,0 +1,381 @@ + + + + + + + + + + + + + + + + EEEE, d MMMM y G + ↑↑↑ + + + + + d MMMM y G + ↑↑↑ + + + + + d MMM y G + ↑↑↑ + + + + + dd/MM/y GGGGG + GGGGGyMMdd + + + + + + ↑↑↑ + ↑↑↑ + ↑↑↑ + E d + ↑↑↑ + ↑↑↑ + ↑↑↑ + ↑↑↑ + ↑↑↑ + ↑↑↑ + dd/MM/y GGGGG + d MMM y G + E, d MMM y G + LL + dd/MM + E, dd/MM + d MMM + E, d MMM + d MMMM + MM/y GGGGG + dd/MM/y GGGGG + E, dd/MM/y GGGGG + d MMM y G + E, d MMM y G + + + + d–d + + + y–y G + + + dd/MM/y – dd/MM/y GGGGG + dd/MM/y GGGGG – dd/MM/y GGGGG + dd/MM/y – dd/MM/y GGGGG + dd/MM/y – dd/MM/y GGGGG + + + E, dd/MM/y – E, dd/MM/y GGGGG + E, dd/MM/y GGGGG – E, dd/MM/y GGGGG + E, dd/MM/y – E, dd/MM/y GGGGG + E, dd/MM/y – E, dd/MM/y GGGGG + + + d–d MMM y G + d MMM y G – d MMM y G + d MMM – d MMM y G + d MMM y – d MMM y G + + + E, d MMM – E, d MMM y G + E, d MMM y G – E, d MMM y G + E, d MMM – E, d MMM y G + E, d MMM y – E, d MMM y G + + + M–M + + + dd/MM – dd/MM + dd/MM – dd/MM + + + E dd/MM – E dd/MM + E dd/MM – E dd/MM + + + d–d MMM + d MMM – d MMM + + + E d – E d MMM + E d MMM – E d MMM + + + y–y G + + + MM/y – MM/y GGGGG + MM/y – MM/y GGGGG + + + dd/MM/y – dd/MM/y GGGGG + dd/MM/y – dd/MM/y GGGGG + dd/MM/y – dd/MM/y GGGGG + + + E, dd/MM/y – E, dd/MM/y GGGGG + E, dd/MM/y – E, dd/MM/y GGGGG + E, dd/MM/y – E, dd/MM/y GGGGG + + + d–d MMM y G + d MMM – d MMM y G + d MMM y – d MMM y G + + + E, d – E, d MMM y G + E, d MMM – E, d MMM y G + E, d MMM y – E, d MMM y G + + + + + + + + + EEEE, d MMMM y + ↑↑↑ + + + + + d MMMM y + ↑↑↑ + + + + + d MMM y + ↑↑↑ + + + + + dd/MM/y + yMMdd + + + + + + ↑↑↑ + ↑↑↑ + E d + ↑↑↑ + ↑↑↑ + ↑↑↑ + ↑↑↑ + ↑↑↑ + ↑↑↑ + d/M/y G + d MMM y G + E, d MMM y G + dd/MM + E, dd/MM + dd/MM + d MMM + E, d MMM + d MMMM + MM/y + dd/MM/y + E, dd/MM/y + d MMM y + E, d MMM y + + + + d–d + + + dd/MM/y – dd/MM/y G + dd/MM/y G – dd/MM/y G + dd/MM/y – dd/MM/y G + dd/MM/y – dd/MM/y G + + + E, dd/MM/y – E, dd/MM/y G + E, dd/MM/y G – E, dd/MM/y G + E, dd/MM/y – E, dd/MM/y G + E, dd/MM/y – E, dd/MM/y G + + + d – d MMM y G + d MMM y G – d MMM y G + d MMM – d MMM y G + d MMM y – d MMM y G + + + E, d MMM – E, d MMM y G + E, d MMM y G – E, d MMM y G + E, d MMM – E, d MMM y G + E, d MMM y – E, d MMM y G + + + h–h a + + + HH–HH + + + HH:mm–HH:mm + HH:mm–HH:mm + + + HH:mm–HH:mm v + HH:mm–HH:mm v + + + h–h a v + + + HH–HH v + + + M–M + + + dd/MM – dd/MM + dd/MM – dd/MM + + + E dd/MM – E dd/MM + E dd/MM – E dd/MM + + + d–d MMM + d MMM – d MMM + + + E d – E d MMM + E d MMM – E d MMM + + + y–y + + + MM/y – MM/y + MM/y – MM/y + + + dd/MM/y – dd/MM/y + dd/MM/y – dd/MM/y + dd/MM/y – dd/MM/y + + + E, dd/MM/y – E, dd/MM/y + E, dd/MM/y – E, dd/MM/y + E, dd/MM/y – E, dd/MM/y + + + d–d MMM y + d MMM – d MMM y + d MMM y – d MMM y + + + E, d – E, d MMM y + E, d MMM – E, d MMM y + E, d MMM y – E, d MMM y + + + + + + + + + ∅∅∅ + ∅∅∅ + ∅∅∅ + + + + + ∅∅∅ + ∅∅∅ + ∅∅∅ + + + + + ∅∅∅ + ∅∅∅ + ∅∅∅ + + + + + ∅∅∅ + ∅∅∅ + ∅∅∅ + + + + + ∅∅∅ + ∅∅∅ + ∅∅∅ + + + + + ∅∅∅ + ∅∅∅ + ∅∅∅ + + + + + ∅∅∅ + ∅∅∅ + ∅∅∅ + + + + + ∅∅∅ + ∅∅∅ + ∅∅∅ + + + + + + + , + . + + + + + ¤ #,##0.00 + + + + + + $ + + + US$ + + + + diff --git a/common/main/en_MX.xml b/common/main/en_MX.xml new file mode 100644 index 00000000000..373fe66de84 --- /dev/null +++ b/common/main/en_MX.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + $ + + + US$ + + + + From 9a37c44aaf03d122e4f703c11d982ce3413247e0 Mon Sep 17 00:00:00 2001 From: Annemarie Apple Date: Wed, 7 May 2025 22:46:43 -0700 Subject: [PATCH 2/4] CLDR-18620 Rename common/en_CO.xml to common/main/en_CO.xml --- common/{ => main}/en_CO.xml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename common/{ => main}/en_CO.xml (100%) diff --git a/common/en_CO.xml b/common/main/en_CO.xml similarity index 100% rename from common/en_CO.xml rename to common/main/en_CO.xml From 36e25aa6a947b27ae03f8606bd25c106e6bf872b Mon Sep 17 00:00:00 2001 From: Annemarie Apple Date: Tue, 12 Aug 2025 13:53:31 -0700 Subject: [PATCH 3/4] CLDR-18620 Update GenerateLikelyTestData.java --- .../main/java/org/unicode/cldr/tool/GenerateLikelyTestData.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GenerateLikelyTestData.java b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GenerateLikelyTestData.java index 5a9e4072006..b5bd7db2f61 100644 --- a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GenerateLikelyTestData.java +++ b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GenerateLikelyTestData.java @@ -91,7 +91,7 @@ public static void check(String test0) { // test data private static Set ALLOWED_WITH_MACROREGION = - Set.of("ar_001", "en_001", "en_150", "es_419"); // only intentional CLDR locales + Set.of("ar_001", "en_001", "en_150", "en_419", "es_419"); // only intentional CLDR locales public static Set getTestCases(Map data) { CalculatedCoverageLevels coverage = CalculatedCoverageLevels.getInstance(); From b2a43d20e340e549969d9b8a89720d5810707afa Mon Sep 17 00:00:00 2001 From: Annemarie Apple Date: Tue, 12 Aug 2025 13:56:12 -0700 Subject: [PATCH 4/4] CLDR-18620 Update TestInheritance.java --- .../src/test/java/org/unicode/cldr/unittest/TestInheritance.java | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestInheritance.java b/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestInheritance.java index 5a887bf1c66..95644aec96e 100644 --- a/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestInheritance.java +++ b/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestInheritance.java @@ -1042,6 +1042,7 @@ public void TestLanguageTagParser() { public void TestParentChain() { String[][] tests = { {"en_DE", "[en_150, en_001, en, root]"}, + {"en_MX", "[en_419, en, root]"}, {"fr_CA", "[fr, root]"}, {"fr", "[root]"}, {"root", "[]"},