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: sgehwolf
Backport-of: e10231248fc100f9dfa08468ac897f60b843857f
  • Loading branch information
gnu-andrew committed Dec 6, 2022
1 parent dbd378c commit 87c8450
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,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
* @bug 8181157 8202537 8234347 8236548 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

1 comment on commit 87c8450

@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.