Blame SOURCES/jdk8293834-kyiv_cldr_update.patch

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