Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CLDR-18061 Bump CLDR versions (except spec); update coverage to fix test failures #4162

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

<!-- [inapplicable lines are commented out.]-->
**Note:** CLDR 46 is in development and not recommended for use at this stage.
<!--**Note:** This is the milestone 1 version of CLDR 46, intended for those wishing to do pre-release testing. It is not recommended for production use.-->
<!--**Note:** This is a preliminary version of CLDR 46, intended for those wishing to do pre-release testing. It is not recommended for production use.-->
<!-- **Note:** This is a pre-release candidate version of CLDR 46, intended for testing. It is not recommended for production use. -->
<!--This is the final release version of CLDR 46.-->
**Note:** CLDR 47 is in development and not recommended for use at this stage.
<!--**Note:** This is the milestone 1 version of CLDR 47, intended for those wishing to do pre-release testing. It is not recommended for production use.-->
<!--**Note:** This is a preliminary version of CLDR 47, intended for those wishing to do pre-release testing. It is not recommended for production use.-->
<!-- **Note:** This is a pre-release candidate version of CLDR 47, intended for testing. It is not recommended for production use. -->
<!--This is the final release version of CLDR 47.-->

### 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.
Expand Down
2 changes: 1 addition & 1 deletion common/dtd/ldml.dtd
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
<!ATTLIST version number CDATA #REQUIRED >
<!--@MATCH:regex/\$Revision.*\$-->
<!--@METADATA-->
<!ATTLIST version cldrVersion CDATA #FIXED "46" >
<!ATTLIST version cldrVersion CDATA #FIXED "47" >
<!--@MATCH:any-->
<!--@VALUE-->
<!ATTLIST version draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
Expand Down
4 changes: 2 additions & 2 deletions common/dtd/ldml.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,10 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
<xs:element name="version">
<xs:complexType>
<xs:attribute name="number" use="required"/>
<xs:attribute default="46" name="cldrVersion">
<xs:attribute default="47" name="cldrVersion">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:enumeration value="46"/>
<xs:enumeration value="47"/>
</xs:restriction>
</xs:simpleType>
</xs:attribute>
Expand Down
2 changes: 1 addition & 1 deletion common/dtd/ldmlBCP47.dtd
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
<!ATTLIST version number CDATA #REQUIRED >
<!--@MATCH:regex/\$Revision.*\$-->
<!--@METADATA-->
<!ATTLIST version cldrVersion CDATA #FIXED "46" >
<!ATTLIST version cldrVersion CDATA #FIXED "47" >
<!--@MATCH:version-->
<!--@VALUE-->

Expand Down
4 changes: 2 additions & 2 deletions common/dtd/ldmlBCP47.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
<xs:element name="version">
<xs:complexType>
<xs:attribute name="number" use="required"/>
<xs:attribute default="46" name="cldrVersion">
<xs:attribute default="47" name="cldrVersion">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:enumeration value="46"/>
<xs:enumeration value="47"/>
</xs:restriction>
</xs:simpleType>
</xs:attribute>
Expand Down
2 changes: 1 addition & 1 deletion common/dtd/ldmlSupplemental.dtd
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
<!ATTLIST version number CDATA #REQUIRED >
<!--@MATCH:any-->
<!--@METADATA-->
<!ATTLIST version cldrVersion CDATA #FIXED "46" >
<!ATTLIST version cldrVersion CDATA #FIXED "47" >
<!--@MATCH:version-->
<!--@VALUE-->
<!ATTLIST version unicodeVersion CDATA #FIXED "16.0.0" >
Expand Down
4 changes: 2 additions & 2 deletions common/dtd/ldmlSupplemental.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
<xs:element name="version">
<xs:complexType>
<xs:attribute name="number" use="required"/>
<xs:attribute default="46" name="cldrVersion">
<xs:attribute default="47" name="cldrVersion">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:enumeration value="46"/>
<xs:enumeration value="47"/>
</xs:restriction>
</xs:simpleType>
</xs:attribute>
Expand Down
4 changes: 2 additions & 2 deletions common/supplemental/coverageLevels.xml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ For terms of use, see http://www.unicode.org/copyright.html
<coverageVariable key="%currency40" value="(BRL|CNY|EUR|GBP|INR|JPY|RUB|USD)"/>
<coverageVariable key="%currency60" value="(AUD|CAD|CHF|DKK|HKD|IDR|KRW|MXN|NOK|PLN|SAR|SEK|THB|TRY|TWD|ZAR)"/>
<coverageVariable key="%currency60_EU" value="(CZK|HUF)"/>
<coverageVariable key="%currency80" value="(AED|AFN|ALL|AMD|ANG|AOA|ARS|AWG|AZN|BAM|BBD|BDT|BGN|BHD|BIF|BMD|BND|BOB|BSD|BTN|BWP|BYN|BZD|CDF|CLP|CNH|COP|CRC|CUC|CUP|CVE|CZK|DJF|DOP|DZD|EGP|ERN|ETB|FJD|FKP|GEL|GHS|GIP|GMD|GNF|GTQ|GYD|HNL|HRK|HTG|HUF|ILS|IQD|IRR|ISK|JMD|JOD|KES|KGS|KHR|KMF|KPW|KWD|KYD|KZT|LAK|LBP|LKR|LRD|LSL|LYD|MAD|MDL|MGA|MKD|MMK|MNT|MOP|MRU|MUR|MVR|MWK|MYR|MZN|NAD|NGN|NIO|NPR|NZD|OMR|PAB|PEN|PGK|PHP|PKR|PYG|QAR|RON|RSD|RWF|SBD|SCR|SDG|SGD|SHP|SL[EL]|SOS|SRD|SSP|STN|SYP|SZL|TJS|TMT|TND|TOP|TTD|TZS|UAH|UGX|UYU|UZS|VES|VND|VUV|WST|XCD|XAF|XOF|XPF|YER|ZMW)"/>
<coverageVariable key="%currency80" value="(AED|AFN|ALL|AMD|ANG|AOA|ARS|AWG|AZN|BAM|BBD|BDT|BGN|BHD|BIF|BMD|BND|BOB|BSD|BTN|BWP|BYN|BZD|CDF|CLP|CNH|COP|CRC|CUC|CUP|CVE|CZK|DJF|DOP|DZD|EGP|ERN|ETB|FJD|FKP|GEL|GHS|GIP|GMD|GNF|GTQ|GYD|HNL|HRK|HTG|HUF|ILS|IQD|IRR|ISK|JMD|JOD|KES|KGS|KHR|KMF|KPW|KWD|KYD|KZT|LAK|LBP|LKR|LRD|LSL|LYD|MAD|MDL|MGA|MKD|MMK|MNT|MOP|MRU|MUR|MVR|MWK|MYR|MZN|NAD|NGN|NIO|NPR|NZD|OMR|PAB|PEN|PGK|PHP|PKR|PYG|QAR|RON|RSD|RWF|SBD|SCR|SDG|SGD|SHP|SL[EL]|SOS|SRD|SSP|STN|SYP|SZL|TJS|TMT|TND|TOP|TTD|TZS|UAH|UGX|UYU|UZS|VES|VND|VUV|WST|XCD|XAF|XOF|XPF|YER|ZMW|ZWG)"/>
<coverageVariable key="%currency100" value="(AFA|ADP|ALK|AO[KNR]|AR[ALMP]|ATS|AZM|BA[DN]|BE[CFL]|BG[LM]|BGO|BO[LPV]|BR[BCENRZ]|BUK|BY[BR]|CH[EW]|CL[EF]|CNX|COU|CS[DK]|CYP|DDM|DEM|EC[SV]|EEK|ES[ABP]|FIM|FRF|GEK|GHC|GNS|GQE|GRD|GW[EP]|HRD|IEP|IL[PR]|ISJ|ITL|KR[HO]|LT[LT]|LU[CFL]|LV[LR]|MAF|MCF|MDC|MGF|MKN|MLF|MRO|MT[LP]|MVP|MX[PV]|MZ[EM]|NIC|NLG|PE[IS]|PLZ|PTE|RHD|ROL|RUR|SD[DP]|SIT|SKK|SRG|STD|SUR|SVC|TJR|TMM|TPE|TRL|UAK|UGS|US[NS]|UY[IPW]|VE[BF]|VNN|XA[GU]|XB[ABCD]|XDR|XEU|XF[OU]|XP[DT]|XRE|XSU|XTS|XUA|YDD|YU[DMNR]|ZAL|ZMK|ZR[NZ]|ZW[DLR])"/>
<coverageVariable key="%cyclicNameTypes" value="([1-9]?[0-9])"/>
<coverageVariable key="%d0Types80" value="(ascii|fwidth|hwidth|lower|title|upper)"/>
Expand Down Expand Up @@ -107,7 +107,7 @@ For terms of use, see http://www.unicode.org/copyright.html
<coverageVariable key="%language60_TD" value="(shu|dzg|kbl|mde|mua|sba)"/>
<!-- See CLDR-16673: All basic+ locales (per coverageLevels.txt) MUST have their language's name at least at level 80 (modern), except for those on exception list -->
<!-- Can use MinimizeRegex.java to "unpack" the compressed lists that are painful to edit -->
<coverageVariable key="%language80" value="(af|am|ar|as|az|be|bg|bgc|bho|bn|brx|bs|ca|ceb|cs|cv|cy|da|de|doi|el|en|es|et|eu|fa|fi|fil|fr|ga|gd|gl|gu|ha|he|hi|hr|hu|hy|id|ig|is|it|ja|jv|ka|kk|km|kn|ko|kok|ks|ky|lo|lt|lv|mai|mi|mk|ml|mn|mni|mr|ms|my|ne|nl|nn|no|or|pa|pcm|pl|ps|pt|raj|ro|ru|sa|sat|sd|si|sk|sl|so|sq|sr|su|sv|sw|ta|te|tg|th|ti|tk|tr|tt|uk|ur|uz|vi|wo|xh|yo|yue|zh|zu|ast|blo|br|chr|csw|dsb|eo|ff|fo|fy|hsb|ia|ie|kea|kgp|ku|kxv|lb|lij|lmo|mt|nds|nqo|oc|prg|qu|rm|sah|sc|syr|szl|to|ug|vec|vmw|xnr|yrl|za|mul|root|zxx|und)"/>
<coverageVariable key="%language80" value="(af|ak|am|ar|as|az|be|bg|bgc|bho|bn|brx|bs|ca|ceb|cs|cv|cy|da|de|doi|ee|el|en|es|et|eu|fa|fi|fil|fr|ga|gaa|gd|gl|gu|ha|he|hi|hr|hu|hy|id|ig|ii|is|it|ja|jv|ka|kk|km|kn|ko|kok|ks|ky|lo|lt|lv|mai|mi|mk|ml|mn|mni|mr|ms|my|ne|nl|nn|no|nso|om|or|pa|pcm|pl|ps|pt|raj|ro|ru|rw|sa|sat|sd|si|sk|sl|so|sq|sr|st|su|sv|sw|ta|te|tg|th|ti|tk|tn|tr|tt|uk|ur|uz|vi|wo|xh|yo|yue|zh|zu|ast|blo|br|chr|csw|dsb|eo|ff|fo|fy|hsb|ia|ie|kea|kgp|ku|kxv|lb|lij|lmo|mt|nds|nqo|oc|prg|qu|rm|sah|sc|syr|szl|to|ug|vec|vmw|xnr|yrl|za|mul|root|zxx|und)"/>
<coverageVariable key="%lbTypes80" value="(strict|normal|loose)"/>
<coverageVariable key="%lwTypes" value="(normal|breakall|keepall|phrase)"/>
<coverageVariable key="%m0Types80" value="(bgn|prprname|ungegn)"/>
Expand Down
2 changes: 1 addition & 1 deletion docs/charts/keyboards/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.unicode.cldr</groupId>
<artifactId>cldr-all</artifactId>
<version>46.0-SNAPSHOT</version>
<version>47.0-SNAPSHOT</version>
<relativePath>../../../tools/pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions keyboards/dtd/ldmlKeyboard3.dtd
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
<!ELEMENT keyboard3 ( import*, locales?, version?, info, settings?, displays?, keys?, flicks?, forms?, layers*, variables?, transforms*, special* ) >
<!ATTLIST keyboard3 locale CDATA #REQUIRED >
<!--@MATCH:validity/bcp47-wellformed-->
<!ATTLIST keyboard3 conformsTo (45 | 46) #REQUIRED >
<!ATTLIST keyboard3 conformsTo (45 | 46 | 47) #REQUIRED >
pedberg-icu marked this conversation as resolved.
Show resolved Hide resolved
<!--@MATCH:version-->
<!--@METADATA-->
<!ATTLIST keyboard3 xmlns CDATA #IMPLIED >
Expand All @@ -32,7 +32,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
<!ATTLIST version number CDATA #IMPLIED >
<!--@MATCH:semver-->
<!--@VALUE-->
<!ATTLIST version cldrVersion CDATA #FIXED "46" >
<!ATTLIST version cldrVersion CDATA #FIXED "47" >
<!--@MATCH:version-->
<!--@METADATA-->

Expand Down
5 changes: 3 additions & 2 deletions keyboards/dtd/ldmlKeyboard3.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
<xs:restriction base="xs:token">
<xs:enumeration value="45"/>
<xs:enumeration value="46"/>
<xs:enumeration value="47"/>
</xs:restriction>
</xs:simpleType>
</xs:attribute>
Expand Down Expand Up @@ -75,10 +76,10 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
<xs:element name="version">
<xs:complexType>
<xs:attribute name="number"/>
<xs:attribute default="46" name="cldrVersion">
<xs:attribute default="47" name="cldrVersion">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:enumeration value="46"/>
<xs:enumeration value="47"/>
</xs:restriction>
</xs:simpleType>
</xs:attribute>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<groupId>org.unicode.cldr</groupId>
<artifactId>cldr-data</artifactId>
<version>46.0-SNAPSHOT</version>
<version>47.0-SNAPSHOT</version>
<name>CLDR Top Level and Data</name>
<packaging>pom</packaging>
<licenses>
Expand Down
2 changes: 1 addition & 1 deletion tools/cldr-apps/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.unicode.cldr</groupId>
<artifactId>cldr-all</artifactId>
<version>46.0-SNAPSHOT</version>
<version>47.0-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion tools/cldr-code/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.unicode.cldr</groupId>
<artifactId>cldr-all</artifactId>
<version>46.0-SNAPSHOT</version>
<version>47.0-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ public enum CldrVersion {
v44_0,
v44_1,
v45_0,
v46_0,
/**
* @see CLDRFile#GEN_VERSION
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<VersionInfo> CLDR_VERSIONS_VI =
Expand All @@ -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<String> CLDR_RELEASE_VERSION_SET =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ public class CLDRFile implements Freezable<CLDRFile>, Iterable<String>, 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<String> SUPPLEMENTAL_NAMES =
Arrays.asList(
"characters",
Expand Down
2 changes: 1 addition & 1 deletion tools/cldr-rdf/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.unicode.cldr</groupId>
<artifactId>cldr-all</artifactId>
<version>46.0-SNAPSHOT</version>
<version>47.0-SNAPSHOT</version>
</parent>


Expand Down
2 changes: 1 addition & 1 deletion tools/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<groupId>org.unicode.cldr</groupId>
<artifactId>cldr-all</artifactId>
<version>46.0-SNAPSHOT</version>
<version>47.0-SNAPSHOT</version>
<name>CLDR All Tools</name>
<packaging>pom</packaging>
<licenses>
Expand Down
Loading