From 7f9a5d6f96996c377107299263422aaf14478f9d Mon Sep 17 00:00:00 2001 From: Peter Edberg <42151464+pedberg-icu@users.noreply.github.com> Date: Wed, 13 Nov 2024 08:18:13 -0800 Subject: [PATCH] CLDR-18097 BRS 46.1 Update cldr & spec versions & status, extend test skip (#4195) --- 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 +-- docs/charts/keyboards/pom.xml | 2 +- docs/ldml/tr35-collation.md | 12 ++++---- docs/ldml/tr35-dates.md | 12 ++++---- docs/ldml/tr35-general.md | 12 ++++---- docs/ldml/tr35-info.md | 12 ++++---- docs/ldml/tr35-keyboards.md | 10 +++---- docs/ldml/tr35-messageFormat.md | 12 ++++---- docs/ldml/tr35-numbers.md | 12 ++++---- docs/ldml/tr35-personNames.md | 12 ++++---- docs/ldml/tr35.md | 30 +++++++++++-------- pom.xml | 2 +- tools/cldr-apps/pom.xml | 2 +- tools/cldr-code/pom.xml | 2 +- .../org/unicode/cldr/tool/CldrVersion.java | 1 + .../org/unicode/cldr/tool/ToolConstants.java | 4 +-- .../java/org/unicode/cldr/util/CLDRFile.java | 2 +- .../unicode/cldr/util/TestCoverageLevel2.java | 10 ++++++- .../java/org/unicode/cldr/util/TestLevel.java | 4 +-- tools/cldr-rdf/pom.xml | 2 +- tools/pom.xml | 2 +- 27 files changed, 100 insertions(+), 87 deletions(-) diff --git a/README.md b/README.md index 9e603ba00b7..cdeb7510ce5 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-10-21 +Update: 2024-11-12 - - - - -This is the final release version of CLDR 46. + + +**Note:** This is a preliminary version of CLDR 46.1, intended for those wishing to do pre-release testing. It is not recommended for production use. + + ### 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..444c58259ce 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..fa684b0704b 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..7509cd43ab3 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..2d0e28031ca 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..de4ca49b89c 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..f391dc8e4c2 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/docs/charts/keyboards/pom.xml b/docs/charts/keyboards/pom.xml index fa062070cae..f1bbdbee87e 100644 --- a/docs/charts/keyboards/pom.xml +++ b/docs/charts/keyboards/pom.xml @@ -19,7 +19,7 @@ org.unicode.cldr cldr-all - 46.0 + 46.1-SNAPSHOT ../../../tools/pom.xml diff --git a/docs/ldml/tr35-collation.md b/docs/ldml/tr35-collation.md index 48d16456b92..5d972f3d2b4 100644 --- a/docs/ldml/tr35-collation.md +++ b/docs/ldml/tr35-collation.md @@ -2,8 +2,8 @@ # Unicode Locale Data Markup Language (LDML)
Part 5: Collation -|Version|46 | -|-------|----------------| +|Version|46.1 (draft) | +|-------|-------------| |Editors|Markus Scherer (markus.icu@gmail.com) and other CLDR committee members| For the full header, summary, and status, see [Part 1: Core](tr35.md). @@ -16,12 +16,12 @@ This is a partial document, describing only those parts of the LDML that are rel ### _Status_ - +This is not a stable document; it is inappropriate to cite this document as other than a work in progress._ -_This document has been reviewed by Unicode members and other interested parties, and has been approved for publication by the Unicode Consortium. -This is a stable document and may be used as reference material or cited as a normative reference by other specifications._ + > _**A Unicode Technical Standard (UTS)** is an independent specification. Conformance to the Unicode Standard does not imply conformance to any UTS._ diff --git a/docs/ldml/tr35-dates.md b/docs/ldml/tr35-dates.md index 614ae13e892..6a3c3f460c8 100644 --- a/docs/ldml/tr35-dates.md +++ b/docs/ldml/tr35-dates.md @@ -2,8 +2,8 @@ # Unicode Locale Data Markup Language (LDML)
Part 4: Dates -|Version|46 | -|-------|------------------| +|Version|46.1 (draft) | +|-------|-------------| |Editors|Peter Edberg and other CLDR committee members| For the full header, summary, and status, see [Part 1: Core](tr35.md). @@ -16,12 +16,12 @@ This is a partial document, describing only those parts of the LDML that are rel ### _Status_ - +This is not a stable document; it is inappropriate to cite this document as other than a work in progress._ -_This document has been reviewed by Unicode members and other interested parties, and has been approved for publication by the Unicode Consortium. -This is a stable document and may be used as reference material or cited as a normative reference by other specifications._ + > _**A Unicode Technical Standard (UTS)** is an independent specification. Conformance to the Unicode Standard does not imply conformance to any UTS._ diff --git a/docs/ldml/tr35-general.md b/docs/ldml/tr35-general.md index af98aab653e..b24686631cc 100644 --- a/docs/ldml/tr35-general.md +++ b/docs/ldml/tr35-general.md @@ -2,8 +2,8 @@ # Unicode Locale Data Markup Language (LDML)
Part 2: General -|Version|46 | -|-------|---------------------| +|Version|46.1 (draft) | +|-------|-------------| |Editors|Yoshito Umaoka (yoshito_umaoka@us.ibm.com) and other CLDR committee members| For the full header, summary, and status, see [Part 1: Core](tr35.md). @@ -16,12 +16,12 @@ This is a partial document, describing general parts of the LDML: display names ### _Status_ - +This is not a stable document; it is inappropriate to cite this document as other than a work in progress._ -_This document has been reviewed by Unicode members and other interested parties, and has been approved for publication by the Unicode Consortium. -This is a stable document and may be used as reference material or cited as a normative reference by other specifications._ + > _**A Unicode Technical Standard (UTS)** is an independent specification. Conformance to the Unicode Standard does not imply conformance to any UTS._ diff --git a/docs/ldml/tr35-info.md b/docs/ldml/tr35-info.md index 5969d0b4e4c..a01cfc259c5 100644 --- a/docs/ldml/tr35-info.md +++ b/docs/ldml/tr35-info.md @@ -2,8 +2,8 @@ # Unicode Locale Data Markup Language (LDML)
Part 6: Supplemental -|Version|46 | -|-------|-----------| +|Version|46.1 (draft) | +|-------|-------------| |Editors|Steven Loomis (srloomis@unicode.org) and other CLDR committee members| For the full header, summary, and status, see [Part 1: Core](tr35.md). @@ -16,12 +16,12 @@ This is a partial document, describing only those parts of the LDML that are rel ### _Status_ - +This is not a stable document; it is inappropriate to cite this document as other than a work in progress._ -_This document has been reviewed by Unicode members and other interested parties, and has been approved for publication by the Unicode Consortium. -This is a stable document and may be used as reference material or cited as a normative reference by other specifications._ + > _**A Unicode Technical Standard (UTS)** is an independent specification. Conformance to the Unicode Standard does not imply conformance to any UTS._ diff --git a/docs/ldml/tr35-keyboards.md b/docs/ldml/tr35-keyboards.md index 6ab803ce8c2..d0757da014a 100644 --- a/docs/ldml/tr35-keyboards.md +++ b/docs/ldml/tr35-keyboards.md @@ -2,7 +2,7 @@ # Unicode Locale Data Markup Language (LDML)
Part 7: Keyboards -|Version|46 | +|Version|46.1 (draft) | |-------|-------------| |Editors|Steven Loomis (srloomis@unicode.org) and other CLDR committee members| @@ -16,12 +16,12 @@ This is a partial document, describing keyboards. For the other parts of the LDM ### _Status_ - +This is not a stable document; it is inappropriate to cite this document as other than a work in progress._ -_This document has been reviewed by Unicode members and other interested parties, and has been approved for publication by the Unicode Consortium. -This is a stable document and may be used as reference material or cited as a normative reference by other specifications._ + > _**A Unicode Technical Standard (UTS)** is an independent specification. Conformance to the Unicode Standard does not imply conformance to any UTS._ diff --git a/docs/ldml/tr35-messageFormat.md b/docs/ldml/tr35-messageFormat.md index 3aafa3b2788..fb19fbcd981 100644 --- a/docs/ldml/tr35-messageFormat.md +++ b/docs/ldml/tr35-messageFormat.md @@ -2,8 +2,8 @@ # Unicode Locale Data Markup Language (LDML)
Part 9: Message Format -|Version|46 | -|-------|------------------------| +|Version|46.1 (draft) | +|-------|-------------| |Editors|Addison Phillips and [other CLDR committee members](tr35.md#Acknowledgments)| For the full header, summary, and status, see [Part 1: Core](tr35.md). @@ -16,12 +16,12 @@ This is a partial document, describing only those parts of the LDML that are rel ### _Status_ - +This is not a stable document; it is inappropriate to cite this document as other than a work in progress._ -_This document has been reviewed by Unicode members and other interested parties, and has been approved for publication by the Unicode Consortium. -This is a stable document and may be used as reference material or cited as a normative reference by other specifications._ + > _**A Unicode Technical Standard (UTS)** is an independent specification. Conformance to the Unicode Standard does not imply conformance to any UTS._ diff --git a/docs/ldml/tr35-numbers.md b/docs/ldml/tr35-numbers.md index 25171d14426..1d5bf047572 100644 --- a/docs/ldml/tr35-numbers.md +++ b/docs/ldml/tr35-numbers.md @@ -2,8 +2,8 @@ # Unicode Locale Data Markup Language (LDML)
Part 3: Numbers -|Version|46 | -|-------|----------| +|Version|46.1 (draft) | +|-------|-------------| |Editors|Shane F. Carr (shane@unicode.org) and other CLDR committee members| For the full header, summary, and status, see [Part 1: Core](tr35.md). @@ -16,12 +16,12 @@ This is a partial document, describing only those parts of the LDML that are rel ### _Status_ - +This is not a stable document; it is inappropriate to cite this document as other than a work in progress._ -_This document has been reviewed by Unicode members and other interested parties, and has been approved for publication by the Unicode Consortium. -This is a stable document and may be used as reference material or cited as a normative reference by other specifications._ + > _**A Unicode Technical Standard (UTS)** is an independent specification. Conformance to the Unicode Standard does not imply conformance to any UTS._ diff --git a/docs/ldml/tr35-personNames.md b/docs/ldml/tr35-personNames.md index 997ac39e254..77a9fd089dd 100644 --- a/docs/ldml/tr35-personNames.md +++ b/docs/ldml/tr35-personNames.md @@ -2,8 +2,8 @@ # Unicode Locale Data Markup Language (LDML)
Part 8: Person Names -|Version|46 | -|-------|------------------------| +|Version|46.1 (draft) | +|-------|-------------| |Editors|Mark Davis, Peter Edberg, Rich Gillam, Alex Kolisnychenko, Mike McKenna and [other CLDR committee members](tr35.md#Acknowledgments)| For the full header, summary, and status, see [Part 1: Core](tr35.md). @@ -16,12 +16,12 @@ This is a partial document, describing only those parts of the LDML that are rel ### _Status_ - +This is not a stable document; it is inappropriate to cite this document as other than a work in progress._ -_This document has been reviewed by Unicode members and other interested parties, and has been approved for publication by the Unicode Consortium. -This is a stable document and may be used as reference material or cited as a normative reference by other specifications._ + > _**A Unicode Technical Standard (UTS)** is an independent specification. Conformance to the Unicode Standard does not imply conformance to any UTS._ diff --git a/docs/ldml/tr35.md b/docs/ldml/tr35.md index 7da7cdeab81..650b87a6c0d 100644 --- a/docs/ldml/tr35.md +++ b/docs/ldml/tr35.md @@ -1,19 +1,19 @@ -## Unicode Technical Standard #35 +## Proposed Update Unicode Technical Standard #35 # Unicode Locale Data Markup Language (LDML) -|Version|46 | -|-------|----------| +|Version|46.1 (draft) | +|-------|-------------| |Editors|Mark Davis (markdavis@google.com) and other CLDR committee members| -|Date|2024-10-21| -|This Version|https://www.unicode.org/reports/tr35/tr35-73/tr35.html| -|Previous Version|https://www.unicode.org/reports/tr35/tr35-72/tr35.html| +|Date|2024-11-12| +|This Version|https://www.unicode.org/reports/tr35/tr35-74/tr35.html| +|Previous Version|https://www.unicode.org/reports/tr35/tr35-73/tr35.html| |Latest Version|https://www.unicode.org/reports/tr35/| |Corrigenda|https://cldr.unicode.org/index/corrigenda| |Latest Proposed Update|https://www.unicode.org/reports/tr35/proposed.html |Namespace|https://www.unicode.org/cldr/| -|DTDs|https://www.unicode.org/cldr/dtd/46/| -|Revision|73| +|DTDs|https://www.unicode.org/cldr/dtd/46.1/| +|Revision|74| ### _Summary_ @@ -21,12 +21,12 @@ This document describes an XML format (_vocabulary_) for the exchange of structu ### _Status_ - +This is not a stable document; it is inappropriate to cite this document as other than a work in progress._ -_This document has been reviewed by Unicode members and other interested parties, and has been approved for publication by the Unicode Consortium. -This is a stable document and may be used as reference material or cited as a normative reference by other specifications._ + > _**A Unicode Technical Standard (UTS)** is an independent specification. Conformance to the Unicode Standard does not imply conformance to any UTS._ @@ -4306,7 +4306,11 @@ Other contributors to CLDR are listed on the [CLDR Project Page](https://www.uni ## Modifications -**Differences from LDML Version 45** +**Changes in LDML Version 46.1 (Differences from Version 46)** + +(TBD) + +**Changes in LDML Version 46 (Differences from Version 45)** ### Conformance Modifications diff --git a/pom.xml b/pom.xml index abefa449289..088093ff355 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.unicode.cldr cldr-data - 46.0 + 46.1-SNAPSHOT CLDR Top Level and Data pom diff --git a/tools/cldr-apps/pom.xml b/tools/cldr-apps/pom.xml index 7add940fe15..831043bc150 100644 --- a/tools/cldr-apps/pom.xml +++ b/tools/cldr-apps/pom.xml @@ -26,7 +26,7 @@ org.unicode.cldr cldr-all - 46.0 + 46.1-SNAPSHOT diff --git a/tools/cldr-code/pom.xml b/tools/cldr-code/pom.xml index 568f14a9429..3b7ce2ec791 100644 --- a/tools/cldr-code/pom.xml +++ b/tools/cldr-code/pom.xml @@ -22,7 +22,7 @@ org.unicode.cldr cldr-all - 46.0 + 46.1-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..13a9e30aa6a 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 = "46.1"; 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..b6e0251e55a 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 = "46.1"; public static final List SUPPLEMENTAL_NAMES = Arrays.asList( "characters", diff --git a/tools/cldr-code/src/test/java/org/unicode/cldr/util/TestCoverageLevel2.java b/tools/cldr-code/src/test/java/org/unicode/cldr/util/TestCoverageLevel2.java index d7c4a43de8a..c026e0c900e 100644 --- a/tools/cldr-code/src/test/java/org/unicode/cldr/util/TestCoverageLevel2.java +++ b/tools/cldr-code/src/test/java/org/unicode/cldr/util/TestCoverageLevel2.java @@ -41,6 +41,11 @@ public void TestCoveragePerf() { } } + // For CLDR 46.1, temporarily skip coverage test for languages that would newly + // fail the coverage test; they are already added to coverage for CLDR 47. + static final Set NO_LANGUAGE_COVERAGE_IN_46_1 = + Set.of("ak", "ee", "gaa", "ii", "nso", "om", "rw", "st", "tn"); + @Test public void TestPriorBasicLanguage() throws IOException { // Fail if the language name is at above this level @@ -86,7 +91,10 @@ public void TestPriorBasicLanguage() throws IOException { if (covs.values().stream() .anyMatch((cov) -> cov.getLevel(xpath.toString()).isAbove(failIfAbove))) { // fail if level > failIfAbove for any of those locales - notInCoverage.add(lang); + // Temporarily skip new failures in 46.1, already addressed for 47. + if (!NO_LANGUAGE_COVERAGE_IN_46_1.contains(lang)) { + notInCoverage.add(lang); + } } } } diff --git a/tools/cldr-code/src/test/java/org/unicode/cldr/util/TestLevel.java b/tools/cldr-code/src/test/java/org/unicode/cldr/util/TestLevel.java index 84c6b56ad0e..089dce40c98 100644 --- a/tools/cldr-code/src/test/java/org/unicode/cldr/util/TestLevel.java +++ b/tools/cldr-code/src/test/java/org/unicode/cldr/util/TestLevel.java @@ -103,8 +103,8 @@ public void testModernCurrencies(final String code) { code.equals("ZWL") && CLDRFile.GEN_VERSION.equals("46"), "Skipping ZWL for CLDR 46"); assumeFalse( - code.equals("ZWG") && CLDRFile.GEN_VERSION.equals("46"), - "Skipping ZWG for CLDR 46"); + code.equals("ZWG") && CLDRFile.GEN_VERSION.startsWith("46"), + "Skipping ZWG for CLDR 46, 46.x"); assertTrue( expect.isAtLeast(l), () -> diff --git a/tools/cldr-rdf/pom.xml b/tools/cldr-rdf/pom.xml index 9302f9348ad..186a554aab5 100644 --- a/tools/cldr-rdf/pom.xml +++ b/tools/cldr-rdf/pom.xml @@ -22,7 +22,7 @@ org.unicode.cldr cldr-all - 46.0 + 46.1-SNAPSHOT diff --git a/tools/pom.xml b/tools/pom.xml index 58033ca8736..d480d4ff90a 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -7,7 +7,7 @@ org.unicode.cldr cldr-all - 46.0 + 46.1-SNAPSHOT CLDR All Tools pom