|
 |
f078e6 |
commit 58ba3b61d276423cef1e1f52bd73c9706cc073fc
|
|
|
f078e6 |
Author: Andrew Hughes <gnu.andrew@redhat.com>
|
|
|
f078e6 |
Date: Sat Oct 15 05:37:36 2022 +0100
|
|
|
f078e6 |
|
|
|
f078e6 |
Backport e10231248fc100f9dfa08468ac897f60b843857f
|
|
|
f078e6 |
|
|
|
f078e6 |
diff --git a/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/bcp47/timezone.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/bcp47/timezone.xml
|
|
|
f078e6 |
index 35f8fc86efa..a9b635b4fa4 100644
|
|
|
f078e6 |
--- a/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/bcp47/timezone.xml
|
|
|
f078e6 |
+++ b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/bcp47/timezone.xml
|
|
|
f078e6 |
@@ -392,7 +392,7 @@ For terms of use, see http://www.unicode.org/copyright.html
|
|
|
f078e6 |
<type name="tvfun" description="Funafuti, Tuvalu" alias="Pacific/Funafuti"/>
|
|
|
f078e6 |
<type name="twtpe" description="Taipei, Taiwan" alias="Asia/Taipei ROC"/>
|
|
|
f078e6 |
<type name="tzdar" description="Dar es Salaam, Tanzania" alias="Africa/Dar_es_Salaam"/>
|
|
|
f078e6 |
- <type name="uaiev" description="Kiev, Ukraine" alias="Europe/Kiev"/>
|
|
|
f078e6 |
+ <type name="uaiev" description="Kyiv, Ukraine" alias="Europe/Kiev Europe/Kyiv"/>
|
|
|
f078e6 |
<type name="uaozh" description="Zaporizhia (Zaporozhye), Ukraine" alias="Europe/Zaporozhye"/>
|
|
|
f078e6 |
<type name="uasip" description="Simferopol, Ukraine" alias="Europe/Simferopol"/>
|
|
|
f078e6 |
<type name="uauzh" description="Uzhhorod (Uzhgorod), Ukraine" alias="Europe/Uzhgorod"/>
|
|
|
f078e6 |
diff --git a/test/jdk/sun/util/resources/cldr/TimeZoneNamesTest.java b/test/jdk/sun/util/resources/cldr/TimeZoneNamesTest.java
|
|
|
f078e6 |
index c2b5672646c..53903d19d3d 100644
|
|
|
f078e6 |
--- a/test/jdk/sun/util/resources/cldr/TimeZoneNamesTest.java
|
|
|
f078e6 |
+++ b/test/jdk/sun/util/resources/cldr/TimeZoneNamesTest.java
|
|
|
f078e6 |
@@ -23,7 +23,7 @@
|
|
|
f078e6 |
|
|
|
f078e6 |
/*
|
|
|
f078e6 |
* @test
|
|
|
f078e6 |
- * @bug 8181157 8202537 8234347 8236548
|
|
|
f078e6 |
+ * @bug 8181157 8202537 8234347 8236548 8293834
|
|
|
f078e6 |
* @modules jdk.localedata
|
|
|
f078e6 |
* @summary Checks CLDR time zone names are generated correctly at runtime
|
|
|
f078e6 |
* @run testng/othervm -Djava.locale.providers=CLDR TimeZoneNamesTest
|
|
|
f078e6 |
@@ -102,6 +102,24 @@ public class TimeZoneNamesTest {
|
|
|
f078e6 |
"UTC+04:00",
|
|
|
f078e6 |
"heure : Astrakhan",
|
|
|
f078e6 |
"UTC+04:00"},
|
|
|
f078e6 |
+ {"Europe/Kyiv", Locale.US, "Eastern European Standard Time",
|
|
|
f078e6 |
+ "GMT+02:00",
|
|
|
f078e6 |
+ "Eastern European Summer Time",
|
|
|
f078e6 |
+ "GMT+03:00",
|
|
|
f078e6 |
+ "Eastern European Time",
|
|
|
f078e6 |
+ "GMT+02:00"},
|
|
|
f078e6 |
+ {"Europe/Kyiv", Locale.FRANCE, "heure normale d\u2019Europe de l\u2019Est",
|
|
|
f078e6 |
+ "UTC+02:00",
|
|
|
f078e6 |
+ "heure d\u2019\u00e9t\u00e9 d\u2019Europe de l\u2019Est",
|
|
|
f078e6 |
+ "UTC+03:00",
|
|
|
f078e6 |
+ "heure d\u2019Europe de l\u2019Est",
|
|
|
f078e6 |
+ "UTC+02:00"},
|
|
|
f078e6 |
+ {"Europe/Kyiv", Locale.GERMANY, "Osteurop\u00e4ische Normalzeit",
|
|
|
f078e6 |
+ "OEZ",
|
|
|
f078e6 |
+ "Osteurop\u00e4ische Sommerzeit",
|
|
|
f078e6 |
+ "OESZ",
|
|
|
f078e6 |
+ "Osteurop\u00e4ische Zeit",
|
|
|
f078e6 |
+ "OEZ"},
|
|
|
f078e6 |
{"Europe/Saratov", Locale.US, "Saratov Standard Time",
|
|
|
f078e6 |
"GMT+04:00",
|
|
|
f078e6 |
"Saratov Daylight Time",
|