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

Commit

Permalink
8296715: CLDR v42 update for tzdata 2022f
Browse files Browse the repository at this point in the history 
Reviewed-by: dcherepanov, bae
Backport-of: 54c986e7d5d0b48a22b4da81c13153ce431c9f2f
  • Loading branch information
Yuri Nesterenko committed Nov 16, 2022
1 parent a38104e commit 42e0659
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
3 changes: 0 additions & 3 deletions make/data/cldr/common/main/es_419.xml
View file
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
View file
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
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 @@ -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
View file
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
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
* 8274658 8283277
* 8274658 8283277 8296715
* @summary Verify locale data
* @modules java.base/sun.util.resources
* @modules jdk.localedata
Expand Down

3 comments on commit 42e0659

@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

@MBaesken
Copy link
Member

Choose a reason for hiding this comment

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

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 42e0659 Nov 30, 2022

Choose a reason for hiding this comment

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

@MBaesken Could not automatically backport 42e0659c to openjdk/jdk17u-dev due to conflicts in the following files:

  • test/jdk/sun/text/resources/LocaleDataTest.java

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk17u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk17u-dev master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b MBaesken-backport-42e0659c

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk15u-dev 42e0659cda75b3cc7687037bf4ceae2f4491418c

# Backport the commit
$ git cherry-pick --no-commit 42e0659cda75b3cc7687037bf4ceae2f4491418c
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 42e0659cda75b3cc7687037bf4ceae2f4491418c'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk17u-dev with the title Backport 42e0659cda75b3cc7687037bf4ceae2f4491418c.

Please sign in to comment.