Skip to content
This repository has been archived by the owner on Feb 2, 2023. It is now read-only.

8296715: CLDR v42 update for tzdata 2022f #305

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 0 additions & 3 deletions make/data/cldr/common/main/es_419.xml
Expand Up @@ -1037,11 +1037,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
<decimalFormats numberSystem="latn">
<decimalFormatLength type="long">
<decimalFormat>
<pattern type="1000000000000" count="one">0 billón</pattern>
<pattern type="1000000000000" count="other">0 billón</pattern>
<pattern type="10000000000000" count="one">00 billones</pattern>
<pattern type="10000000000000" count="other">00 billones</pattern>
<pattern type="100000000000000" count="one">000 billones</pattern>
<pattern type="100000000000000" count="other">000 billones</pattern>
</decimalFormat>
</decimalFormatLength>
Expand Down
3 changes: 0 additions & 3 deletions make/data/cldr/common/main/es_MX.xml
Expand Up @@ -795,11 +795,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
<decimalFormats numberSystem="latn">
<decimalFormatLength type="long">
<decimalFormat>
<pattern type="1000000000000" count="one">0 billón</pattern>
<pattern type="1000000000000" count="other">0 billones</pattern>
<pattern type="10000000000000" count="one">00 billones</pattern>
<pattern type="10000000000000" count="other">00 billones</pattern>
<pattern type="100000000000000" count="one">000 billones</pattern>
<pattern type="100000000000000" count="other">000 billones</pattern>
</decimalFormat>
</decimalFormatLength>
Expand Down
6 changes: 4 additions & 2 deletions make/data/cldr/common/supplemental/metaZones.xml
Expand Up @@ -330,7 +330,8 @@ For terms of use, see http://www.unicode.org/copyright.html
</timezone>
<timezone type="America/Chihuahua">
<usesMetazone to="1998-04-05 09:00" mzone="America_Central"/>
<usesMetazone from="1998-04-05 09:00" mzone="Mexico_Pacific"/>
<usesMetazone to="2022-10-30 08:00" from="1998-04-05 09:00" mzone="Mexico_Pacific"/>
<usesMetazone from="2022-10-30 08:00" mzone="America_Central"/>
</timezone>
<timezone type="America/Coral_Harbour">
<usesMetazone mzone="America_Eastern"/>
Expand Down Expand Up @@ -616,7 +617,8 @@ For terms of use, see http://www.unicode.org/copyright.html
</timezone>
<timezone type="America/Ojinaga">
<usesMetazone to="1998-04-05 09:00" mzone="America_Central"/>
<usesMetazone from="1998-04-05 09:00" mzone="America_Mountain"/>
<usesMetazone to="2022-10-30 08:00" from="1998-04-05 09:00" mzone="America_Mountain"/>
<usesMetazone from="2022-10-30 08:00" mzone="America_Central"/>
</timezone>
<timezone type="America/Panama">
<usesMetazone mzone="America_Eastern"/>
Expand Down
4 changes: 4 additions & 0 deletions test/jdk/sun/text/resources/LocaleData.cldr
Expand Up @@ -8394,3 +8394,7 @@ FormatData/de/latn.NumberElements/12=
FormatData/de_AT/latn.NumberElements/12=.
FormatData/fr/latn.NumberElements/11=
FormatData/fr_CH/latn.NumberElements/11=.

# tzdata2022f
TimeZoneNames/en/America\/Ojinaga/1=Central Standard Time
TimeZoneNames/en/America\/Chihuahua/1=Central Standard Time
2 changes: 1 addition & 1 deletion test/jdk/sun/text/resources/LocaleDataTest.java
Expand Up @@ -40,7 +40,7 @@
* 8145136 8145952 8164784 8037111 8081643 7037368 8178872 8185841 8190918
* 8187946 8195478 8181157 8179071 8193552 8202026 8204269 8202537 8208746
* 8209775 8221432 8227127 8230284 8231273 8233579 8234288 8250665 8255086
* 8274658 8283277
* 8274658 8283277 8296715
* @summary Verify locale data
* @modules java.base/sun.util.resources
* @modules jdk.localedata
Expand Down