Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
8296715: CLDR v42 update for tzdata 2022f
Reviewed-by: mdoerr, yan
Backport-of: b8e815b6fe0f4818628d8df05f398e92355e35fb
  • Loading branch information
MBaesken committed Dec 2, 2022
1 parent dcc318c commit da9de48
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 8 deletions.
Expand Up @@ -1018,11 +1018,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
Expand Up @@ -327,8 +327,9 @@ For terms of use, see http://www.unicode.org/copyright.html
<usesMetazone mzone="America_Central"/>
</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="1998-04-05 09:00" mzone="America_Central"/>
<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 @@ -611,8 +612,9 @@ For terms of use, see http://www.unicode.org/copyright.html
<usesMetazone from="2003-10-26 08:00" mzone="America_Central"/>
</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="1998-04-05 09:00" mzone="America_Central"/>
<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 @@ -8382,3 +8382,7 @@ CalendarData/zh_SG/minimalDaysInFirstWeek=1: 001 GU UM US VI;4: AD AN AT AX BE B
CalendarData/zh_SG/firstDayOfWeek=1: AG AR AS AU BD BR BS BT BW BZ CA CN CO DM DO ET GT GU HK HN ID IE IL IN JM JP KE KH KR LA MH MM MO MT MX MZ NI NP PA PE PH PK PR PY SA SG SV TH TN TT TW UM US VE VI WS YE ZA ZW;2: 001 AD AI AL AM AN AT AX AZ BA BE BG BM BN BY CH CL CM CR CY CZ DE DK EC EE ES FI FJ FO FR GB GE GF GP GR HR HU IS IT KG KZ LB LI LK LT LU LV MC MD ME MK MN MQ MY NL NO NZ PL PT 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 MA OM QA SD SY
CalendarData/zh_TW/firstDayOfWeek=1: AG AR AS AU BD BR BS BT BW BZ CA CN CO DM DO ET GT GU HK HN ID IE IL IN JM JP KE KH KR LA MH MM MO MT MX MZ NI NP PA PE PH PK PR PY SA SG SV TH TN TT TW UM US VE VI WS YE ZA ZW;2: 001 AD AI AL AM AN AT AX AZ BA BE BG BM BN BY CH CL CM CR CY CZ DE DK EC EE ES FI FJ FO FR GB GE GF GP GR HR HU IS IT KG KZ LB LI LK LT LU LV MC MD ME MK MN MQ MY NL NO NZ PL PT 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 MA OM QA SD SY
CalendarData/zh_TW/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
Expand Up @@ -39,7 +39,7 @@
* 8017142 8037343 8055222 8042126 8074791 8075173 8080774 8129361 8134916
* 8145136 8145952 8164784 8037111 8081643 7037368 8178872 8185841 8190918
* 8187946 8195478 8181157 8179071 8193552 8202026 8204269 8202537 8208746
* 8209775 8227127 8234288 8250665 8255086 8274658 8283277
* 8209775 8227127 8234288 8250665 8255086 8274658 8283277 8296715
* @summary Verify locale data
* @modules java.base/sun.util.resources
* @modules jdk.localedata
Expand Down

1 comment on commit da9de48

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

Please sign in to comment.