From 17a5a1d6bdebf2e5854949c3d51ab33faf9e2aba Mon Sep 17 00:00:00 2001
From: phh <none@none>
Date: Wed, 4 Dec 2019 15:01:22 -0800
Subject: [PATCH] 8234288: Turkey Time Zone returns incorrect time zone name
 Summary: Add and use "Turkey Time" time zone. Reviewed-by: naoto, martin, phh
 Contributed-by: letuyang@amazon.com

---
 .../classes/sun/util/resources/TimeZoneNames.java  |  9 ++++++---
 test/sun/text/resources/LocaleData                 | 14 ++++++++++++++
 test/sun/text/resources/LocaleDataTest.java        |  2 +-
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/share/classes/sun/util/resources/TimeZoneNames.java b/src/share/classes/sun/util/resources/TimeZoneNames.java
index 2c4b56da7..a7ad9cc23 100644
--- a/src/share/classes/sun/util/resources/TimeZoneNames.java
+++ b/src/share/classes/sun/util/resources/TimeZoneNames.java
@@ -242,6 +242,9 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
         String TMT[] = new String[] {"Turkmenistan Time", "TMT",
                                      "Turkmenistan Summer Time", "TMST",
                                      "Turkmenistan Time", "TMT"};
+        String TRT[] = new String[] {"Turkey Time", "TRT",
+                                     "Turkey Summer Time", "TRST",
+                                     "Turkey Time", "TRT"};
         String ULAT[]= new String[] {"Ulaanbaatar Time", "ULAT",
                                      "Ulaanbaatar Summer Time", "ULAST",
                                      "Ulaanbaatar Time", "ULAT"};
@@ -639,7 +642,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
                                         "Hovd Summer Time", "HOVST",
                                         "Hovd Time", "HOVT"}},
             {"Asia/Irkutsk", IRKT},
-            {"Asia/Istanbul", EET},
+            {"Asia/Istanbul", TRT},
             {"Asia/Jakarta", WIT},
             {"Asia/Jayapura", new String[] {"East Indonesia Time", "WIT",
                                             "East Indonesia Summer Time", "EIST",
@@ -819,7 +822,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
             {"Europe/Guernsey", GMTBST},
             {"Europe/Helsinki", EET},
             {"Europe/Isle_of_Man", GMTBST},
-            {"Europe/Istanbul", EET},
+            {"Europe/Istanbul", TRT},
             {"Europe/Jersey", GMTBST},
             {"Europe/Kaliningrad", EET},
             {"Europe/Kiev", EET},
@@ -1021,7 +1024,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
             {"SystemV/PST8PDT", PST},
             {"SystemV/YST9", AKST},
             {"SystemV/YST9YDT", AKST},
-            {"Turkey", EET},
+            {"Turkey", TRT},
             {"UCT", UTC},
             {"Universal", UTC},
             {"US/Alaska", AKST},
diff --git a/test/sun/text/resources/LocaleData b/test/sun/text/resources/LocaleData
index f8a517eb2..ad4ff9029 100644
--- a/test/sun/text/resources/LocaleData
+++ b/test/sun/text/resources/LocaleData
@@ -8310,3 +8310,17 @@ CurrencyNames//ves=Venezuelan Bol\u00edvar Soberano
 # For Peru decimal separator is changed to dot(.) and grouping separator is changed to comma(,)
 FormatData/es_PE/NumberElements/0=.
 FormatData/es_PE/NumberElements/1=,
+
+# bug 8234288
+TimeZoneNames/en/Asia\/Istanbul/1=Turkey Time
+TimeZoneNames/en/Asia\/Istanbul/2=TRT
+TimeZoneNames/en/Asia\/Istanbul/3=Turkey Summer Time
+TimeZoneNames/en/Asia\/Istanbul/4=TRST
+TimeZoneNames/en/Europe\/Istanbul/1=Turkey Time
+TimeZoneNames/en/Europe\/Istanbul/2=TRT
+TimeZoneNames/en/Europe\/Istanbul/3=Turkey Summer Time
+TimeZoneNames/en/Europe\/Istanbul/4=TRST
+TimeZoneNames/en/Turkey/1=Turkey Time
+TimeZoneNames/en/Turkey/2=TRT
+TimeZoneNames/en/Turkey/3=Turkey Summer Time
+TimeZoneNames/en/Turkey/4=TRST
diff --git a/test/sun/text/resources/LocaleDataTest.java b/test/sun/text/resources/LocaleDataTest.java
index 4ca9415d5..e00a77b85 100644
--- a/test/sun/text/resources/LocaleDataTest.java
+++ b/test/sun/text/resources/LocaleDataTest.java
@@ -37,7 +37,7 @@
  *      7003124 7085757 7028073 7171028 7189611 8000983 7195759 8004489 8006509
  *      7114053 7074882 7040556 8013836 8021121 6192407 6931564 8027695 7090826
  *      8017142 8037343 8055222 8042126 8074791 8075173 8080774 8129361 8145952
- *      8164784 8187946 8195478 8193552 8202026 8204269 8208746 8209775
+ *      8164784 8187946 8195478 8193552 8202026 8204269 8208746 8209775 8234228
  * @summary Verify locale data
  *
  */
-- 
GitLab