stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8234288: Turkey Time Zone returns incorrect time zone name

Browse Source 
Add and use "Turkey Time" time zone.

Reviewed-by: naoto, martin, phh
This commit is contained in:
Letu Yang 2019-12-04 15:01:22 -08:00 committed by Paul Hohensee
parent e8c10bc9cd
commit 06257b3f1d
3 changed files with 21 additions and 4 deletions
src/java.base/share/classes/sun/util/resources
TimeZoneNames.java
test/jdk/sun/text/resources
LocaleDataLocaleDataTest.java

9
src/java.base/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"};
@ -647,7 +650,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",
@ -833,7 +836,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},
@ -1044,7 +1047,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},

14
test/jdk/sun/text/resources/LocaleData

@ -8334,3 +8334,17 @@ FormatData/zh/short.Eras/0=\u516c\u5143\u524d
FormatData/zh/short.Eras/1=\u516c\u5143
FormatData/zh_TW/short.Eras/0=\u897f\u5143\u524d
FormatData/zh_TW/short.Eras/1=\u897f\u5143
# 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

2
test/jdk/sun/text/resources/LocaleDataTest.java

@ -39,7 +39,7 @@
* 8017142 8037343 8055222 8042126 8074791 8075173 8080774 8129361 8134916
* 8145136 8145952 8164784 8037111 8081643 7037368 8178872 8185841 8190918
* 8187946 8195478 8181157 8179071 8193552 8202026 8204269 8202537 8208746
* 8209775 8221432 8227127 8230284 8231273 8233579
* 8209775 8221432 8227127 8230284 8231273 8233579 8234288
* @summary Verify locale data
* @modules java.base/sun.util.resources
* @modules jdk.localedata