Skip to content

Commit

Permalink
8293834: Update CLDR data following tzdata 2022c update
Browse files Browse the repository at this point in the history
Reviewed-by: phh
Backport-of: e10231248fc100f9dfa08468ac897f60b843857f
  • Loading branch information
gnu-andrew committed Nov 17, 2022
1 parent 32aec43 commit 52103da
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 2 deletions.
2 changes: 1 addition & 1 deletion make/data/cldr/common/bcp47/timezone.xml
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ For terms of use, see http://www.unicode.org/copyright.html
<type name="tvfun" description="Funafuti, Tuvalu" alias="Pacific/Funafuti"/>
<type name="twtpe" description="Taipei, Taiwan" alias="Asia/Taipei ROC"/>
<type name="tzdar" description="Dar es Salaam, Tanzania" alias="Africa/Dar_es_Salaam"/>
<type name="uaiev" description="Kiev, Ukraine" alias="Europe/Kiev"/>
<type name="uaiev" description="Kyiv, Ukraine" alias="Europe/Kiev Europe/Kyiv"/>
<type name="uaozh" description="Zaporizhia (Zaporozhye), Ukraine" alias="Europe/Zaporozhye"/>
<type name="uasip" description="Simferopol, Ukraine" alias="Europe/Simferopol"/>
<type name="uauzh" description="Uzhhorod (Uzhgorod), Ukraine" alias="Europe/Uzhgorod"/>
Expand Down
20 changes: 19 additions & 1 deletion test/jdk/sun/util/resources/cldr/TimeZoneNamesTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

/*
* @test
* @bug 8181157 8202537 8234347 8236548 8261279
* @bug 8181157 8202537 8234347 8236548 8261279 8293834
* @modules jdk.localedata
* @summary Checks CLDR time zone names are generated correctly at runtime
* @run testng/othervm -Djava.locale.providers=CLDR TimeZoneNamesTest
Expand Down Expand Up @@ -102,6 +102,24 @@ Object[][] data() {
"UTC+04:00",
"heure : Astrakhan",
"UTC+04:00"},
{"Europe/Kyiv", Locale.US, "Eastern European Standard Time",
"GMT+02:00",
"Eastern European Summer Time",
"GMT+03:00",
"Eastern European Time",
"GMT+02:00"},
{"Europe/Kyiv", Locale.FRANCE, "heure normale d\u2019Europe de l\u2019Est",
"UTC+02:00",
"heure d\u2019\u00e9t\u00e9 d\u2019Europe de l\u2019Est",
"UTC+03:00",
"heure d\u2019Europe de l\u2019Est",
"UTC+02:00"},
{"Europe/Kyiv", Locale.GERMANY, "Osteurop\u00e4ische Normalzeit",
"OEZ",
"Osteurop\u00e4ische Sommerzeit",
"OESZ",
"Osteurop\u00e4ische Zeit",
"OEZ"},
{"Europe/Saratov", Locale.US, "Saratov Standard Time",
"GMT+04:00",
"Saratov Daylight Time",
Expand Down

5 comments on commit 52103da

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

@gnu-andrew
Copy link
Member Author

Choose a reason for hiding this comment

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

/backport jdk11u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 52103da Nov 25, 2022

Choose a reason for hiding this comment

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

@gnu-andrew Could not automatically backport 52103da0 to openjdk/jdk11u-dev due to conflicts in the following files:

  • test/jdk/sun/util/resources/cldr/TimeZoneNamesTest.java

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk11u-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/jdk11u-dev master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b gnu-andrew-backport-52103da0

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk17u-dev 52103da08c931f1a4599fa191d8f1cc6ca74d9bd

# Backport the commit
$ git cherry-pick --no-commit 52103da08c931f1a4599fa191d8f1cc6ca74d9bd
# Resolve conflicts now

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

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk11u-dev with the title Backport 52103da08c931f1a4599fa191d8f1cc6ca74d9bd.

@gnu-andrew
Copy link
Member Author

Choose a reason for hiding this comment

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

/backport jdk15u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 52103da Dec 14, 2022

Choose a reason for hiding this comment

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

@gnu-andrew the backport was successfully created on the branch gnu-andrew-backport-52103da0 in my personal fork of openjdk/jdk15u-dev. To create a pull request with this backport targeting openjdk/jdk15u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 52103da0 from the openjdk/jdk17u-dev repository.

The commit being backported was authored by Andrew John Hughes on 17 Nov 2022 and was reviewed by Paul Hohensee.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk15u-dev:

$ git fetch https://github.com/openjdk-bots/jdk15u-dev gnu-andrew-backport-52103da0:gnu-andrew-backport-52103da0
$ git checkout gnu-andrew-backport-52103da0
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk15u-dev gnu-andrew-backport-52103da0

Please sign in to comment.