From 1db6850d27fc4108a6e1e8d96abb43f05960ceea Mon Sep 17 00:00:00 2001 From: Peter Edberg <42151464+pedberg-icu@users.noreply.github.com> Date: Sat, 26 Oct 2024 10:18:47 -0700 Subject: [PATCH] CLDR-18061 Bump CLDR versions (except spec); update coverage to fix test failures (#4162) --- README.md | 12 ++++++------ common/dtd/ldml.dtd | 2 +- common/dtd/ldml.xsd | 4 ++-- common/dtd/ldmlBCP47.dtd | 2 +- common/dtd/ldmlBCP47.xsd | 4 ++-- common/dtd/ldmlSupplemental.dtd | 2 +- common/dtd/ldmlSupplemental.xsd | 4 ++-- common/supplemental/coverageLevels.xml | 4 ++-- docs/charts/keyboards/pom.xml | 2 +- keyboards/dtd/ldmlKeyboard3.dtd | 4 ++-- keyboards/dtd/ldmlKeyboard3.xsd | 5 +++-- pom.xml | 2 +- tools/cldr-apps/pom.xml | 2 +- tools/cldr-code/pom.xml | 2 +- .../main/java/org/unicode/cldr/tool/CldrVersion.java | 1 + .../java/org/unicode/cldr/tool/ToolConstants.java | 4 ++-- .../main/java/org/unicode/cldr/util/CLDRFile.java | 2 +- tools/cldr-rdf/pom.xml | 2 +- tools/pom.xml | 2 +- 19 files changed, 32 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index 239859dfa3c..392385a145b 100644 --- a/README.md +++ b/README.md @@ -10,14 +10,14 @@ For current CLDR release information, see [cldr.unicode.org](https://cldr.unicod ## Status -Update: 2024-04-22 +Update: 2024-10-25 -**Note:** CLDR 46 is in development and not recommended for use at this stage. - - - - +**Note:** CLDR 47 is in development and not recommended for use at this stage. + + + + ### What is CLDR? The Unicode Common Locale Data Repository (CLDR) provides key building blocks for software to support the world's languages, with the largest and most extensive standard repository of locale data available. This data is used by a [wide spectrum of companies](https://cldr.unicode.org/index#h.ezpykkomyltl) for their software internationalization and localization, adapting software to the conventions of different languages for such common software tasks. diff --git a/common/dtd/ldml.dtd b/common/dtd/ldml.dtd index efe1565f53d..984e03305a5 100644 --- a/common/dtd/ldml.dtd +++ b/common/dtd/ldml.dtd @@ -42,7 +42,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + diff --git a/common/dtd/ldml.xsd b/common/dtd/ldml.xsd index ee03c2275cc..ff4160d52ed 100644 --- a/common/dtd/ldml.xsd +++ b/common/dtd/ldml.xsd @@ -128,10 +128,10 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - + - + diff --git a/common/dtd/ldmlBCP47.dtd b/common/dtd/ldmlBCP47.dtd index e69ae1e7724..a514722b072 100644 --- a/common/dtd/ldmlBCP47.dtd +++ b/common/dtd/ldmlBCP47.dtd @@ -12,7 +12,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + diff --git a/common/dtd/ldmlBCP47.xsd b/common/dtd/ldmlBCP47.xsd index d55d3f40728..261bf5fadb5 100644 --- a/common/dtd/ldmlBCP47.xsd +++ b/common/dtd/ldmlBCP47.xsd @@ -24,10 +24,10 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - + - + diff --git a/common/dtd/ldmlSupplemental.dtd b/common/dtd/ldmlSupplemental.dtd index 338b8be5c99..0ce28c9755e 100644 --- a/common/dtd/ldmlSupplemental.dtd +++ b/common/dtd/ldmlSupplemental.dtd @@ -12,7 +12,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + diff --git a/common/dtd/ldmlSupplemental.xsd b/common/dtd/ldmlSupplemental.xsd index 6716f017f62..89c80824dfb 100644 --- a/common/dtd/ldmlSupplemental.xsd +++ b/common/dtd/ldmlSupplemental.xsd @@ -64,10 +64,10 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - + - + diff --git a/common/supplemental/coverageLevels.xml b/common/supplemental/coverageLevels.xml index e90743ead92..d1101ca541e 100644 --- a/common/supplemental/coverageLevels.xml +++ b/common/supplemental/coverageLevels.xml @@ -68,7 +68,7 @@ For terms of use, see http://www.unicode.org/copyright.html - + @@ -107,7 +107,7 @@ For terms of use, see http://www.unicode.org/copyright.html - + diff --git a/docs/charts/keyboards/pom.xml b/docs/charts/keyboards/pom.xml index 3b03de01ee0..b9fa66a2827 100644 --- a/docs/charts/keyboards/pom.xml +++ b/docs/charts/keyboards/pom.xml @@ -19,7 +19,7 @@ org.unicode.cldr cldr-all - 46.0-SNAPSHOT + 47.0-SNAPSHOT ../../../tools/pom.xml diff --git a/keyboards/dtd/ldmlKeyboard3.dtd b/keyboards/dtd/ldmlKeyboard3.dtd index 58f294a37c0..7c8346cb1c6 100644 --- a/keyboards/dtd/ldmlKeyboard3.dtd +++ b/keyboards/dtd/ldmlKeyboard3.dtd @@ -10,7 +10,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + @@ -32,7 +32,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + diff --git a/keyboards/dtd/ldmlKeyboard3.xsd b/keyboards/dtd/ldmlKeyboard3.xsd index 84dc19e4925..4db704e3b9d 100644 --- a/keyboards/dtd/ldmlKeyboard3.xsd +++ b/keyboards/dtd/ldmlKeyboard3.xsd @@ -36,6 +36,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file + @@ -75,10 +76,10 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - + - + diff --git a/pom.xml b/pom.xml index ac8b902a1cd..d50bdca0fa0 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.unicode.cldr cldr-data - 46.0-SNAPSHOT + 47.0-SNAPSHOT CLDR Top Level and Data pom diff --git a/tools/cldr-apps/pom.xml b/tools/cldr-apps/pom.xml index 4cbbcf536b6..218c4a362fb 100644 --- a/tools/cldr-apps/pom.xml +++ b/tools/cldr-apps/pom.xml @@ -26,7 +26,7 @@ org.unicode.cldr cldr-all - 46.0-SNAPSHOT + 47.0-SNAPSHOT diff --git a/tools/cldr-code/pom.xml b/tools/cldr-code/pom.xml index 361f456f889..9dc23550d85 100644 --- a/tools/cldr-code/pom.xml +++ b/tools/cldr-code/pom.xml @@ -22,7 +22,7 @@ org.unicode.cldr cldr-all - 46.0-SNAPSHOT + 47.0-SNAPSHOT diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/CldrVersion.java b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/CldrVersion.java index c3e34f44449..a106cd7c8ff 100644 --- a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/CldrVersion.java +++ b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/CldrVersion.java @@ -69,6 +69,7 @@ public enum CldrVersion { v44_0, v44_1, v45_0, + v46_0, /** * @see CLDRFile#GEN_VERSION */ diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/ToolConstants.java b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/ToolConstants.java index 510edfc3c4b..7dabdf5f034 100644 --- a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/ToolConstants.java +++ b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/ToolConstants.java @@ -31,7 +31,7 @@ public enum ChartStatus { "1.7.2", "1.8.1", "1.9.1", "2.0.1", "21.0", "22.1", "23.1", "24.0", "25.0", "26.0", "27.0", "28.0", "29.0", "30.0", "31.0", "32.0", "33.0", "33.1", "34.0", "35.0", "35.1", "36.0", "36.1", "37.0", "38.0", "38.1", "39.0", "40.0", "41.0", - "42.0", "43.0", "44.0", "44.1", "45.0" + "42.0", "43.0", "44.0", "44.1", "45.0", "46.0" // add to this once the release is final! ); public static final Set CLDR_VERSIONS_VI = @@ -40,7 +40,7 @@ public enum ChartStatus { .map(x -> VersionInfo.getInstance(x)) .collect(Collectors.toList())); - public static final String DEV_VERSION = "46"; + public static final String DEV_VERSION = "47"; public static final VersionInfo DEV_VERSION_VI = VersionInfo.getInstance(DEV_VERSION); public static final Set CLDR_RELEASE_VERSION_SET = diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRFile.java b/tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRFile.java index 24dc82f642c..c5d7e830501 100644 --- a/tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRFile.java +++ b/tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRFile.java @@ -135,7 +135,7 @@ public class CLDRFile implements Freezable, Iterable, LocaleSt public static final String SUPPLEMENTAL_NAME = "supplementalData"; public static final String SUPPLEMENTAL_METADATA = "supplementalMetadata"; public static final String SUPPLEMENTAL_PREFIX = "supplemental"; - public static final String GEN_VERSION = "46"; + public static final String GEN_VERSION = "47"; public static final List SUPPLEMENTAL_NAMES = Arrays.asList( "characters", diff --git a/tools/cldr-rdf/pom.xml b/tools/cldr-rdf/pom.xml index 745054b8239..4e3150cff34 100644 --- a/tools/cldr-rdf/pom.xml +++ b/tools/cldr-rdf/pom.xml @@ -22,7 +22,7 @@ org.unicode.cldr cldr-all - 46.0-SNAPSHOT + 47.0-SNAPSHOT diff --git a/tools/pom.xml b/tools/pom.xml index 850055d6e5f..5e4650b4e3f 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -7,7 +7,7 @@ org.unicode.cldr cldr-all - 46.0-SNAPSHOT + 47.0-SNAPSHOT CLDR All Tools pom