Skip to content

Commit

Permalink
8296715: CLDR v42 update for tzdata 2022f
Browse files Browse the repository at this point in the history 
Reviewed-by: joehw
  • Loading branch information
@naotoj
naotoj committed Nov 10, 2022
1 parent 4a68210 commit 54c986e
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion make/data/cldr/common/dtd/ldmlSupplemental.dtd
View file
Expand Up @@ -15,7 +15,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
<!ATTLIST version cldrVersion CDATA #FIXED "42" >
<!--@MATCH:version-->
<!--@VALUE-->
<!ATTLIST version unicodeVersion CDATA #FIXED "14.0.0" >
<!ATTLIST version unicodeVersion CDATA #FIXED "15.0.0" >
<!--@MATCH:version-->
<!--@VALUE-->

Expand Down
3 changes: 0 additions & 3 deletions make/data/cldr/common/main/es_419.xml
View file
Expand Up @@ -1025,11 +1025,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
View file
Expand Up @@ -643,11 +643,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
View file
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 @@ -613,7 +614,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
View file
Expand Up @@ -7871,3 +7871,7 @@ FormatData/nn/latn.NumberElements/1=\u00a0
# CalendarData consolidated to root
CalendarData//firstDayOfWeek=1: AG AS BD BR BS BT BW BZ CA CO DM DO ET GT GU HK HN ID IL IN JM JP KE KH KR LA MH MM MO MT MX MZ NI NP PA PE PH PK PR PT PY SA SG SV TH TT TW UM US VE VI WS YE ZA ZW;2: 001 AD AI AL AM AN AR AT AU AX AZ BA BE BG BM BN BY CH CL CM CN CR CY CZ DE DK EC EE ES FI FJ FO FR GB GE GF GP GR HR HU IE IS IT KG KZ LB LI LK LT LU LV MC MD ME MK MN MQ MY NL NO NZ PL RE RO RS RU SE SI SK SM TJ TM TR UA UY UZ VA VN XK;6: MV;7: AE AF BH DJ DZ EG IQ IR JO KW LY OM QA SD SY
CalendarData//minimalDaysInFirstWeek=1: 001 GU UM US VI;4: AD AN AT AX BE BG CH CZ DE DK EE ES FI FJ FO FR GB GF GG GI GP GR HU IE IM IS IT JE LI LT LU MC MQ NL NO PL PT RE RU SE SJ SK SM VA

# 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
View file
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
* 8251317 8274658 8283277 8283805 8265315 8287868 8295564 8284840
* 8251317 8274658 8283277 8283805 8265315 8287868 8295564 8284840 8296715
* @summary Verify locale data
* @modules java.base/sun.util.resources
* @modules jdk.localedata
Expand Down

1 comment on commit 54c986e

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review

Issues

Please sign in to comment.