archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8202537: CLDR33

Browse source 
Upgraded CLDR data to V33.

Reviewed-by: naoto
This commit is contained in:
Rachna Goel 2018-06-15 11:58:34 +05:30
parent 0c633885f1
commit 65a85be9c7
773 changed files with 263727 additions and 53437 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/java.base/share/classes/sun/util/cldr/CLDRTimeZoneNameProviderImpl.java
View file

@ -178,13 +178,27 @@ public class CLDRTimeZoneNameProviderImpl extends TimeZoneNameProviderImpl {
// last resort
String id = names[INDEX_TZID].toUpperCase(Locale.ROOT);
if (!id.startsWith("ETC/GMT") &&
!id.startsWith("GMT") &&
!id.startsWith("UT")) {
if (!id.startsWith("UT")) {
names[index] = toGMTFormat(names[INDEX_TZID],
index == INDEX_DST_LONG || index == INDEX_DST_SHORT,
index % 2 != 0,
locale);
// aliases of "GMT" timezone.
if ((exists(names, INDEX_STD_LONG)) && (id.startsWith("Etc/")
|| id.startsWith("GMT") || id.startsWith("Greenwich"))) {
switch (id) {
case "Etc/GMT":
case "Etc/GMT-0":
case "Etc/GMT+0":
case "Etc/GMT0":
case "GMT+0":
case "GMT-0":
case "GMT0":
case "Greenwich":
names[INDEX_DST_LONG] = names[INDEX_GEN_LONG] = names[INDEX_STD_LONG];
break;
}
}
}
}

13
src/java.base/share/classes/sun/util/resources/TimeZoneNames.java
View file

@ -522,6 +522,9 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
{"America/Porto_Acre", ACT},
{"America/Porto_Velho", AMT},
{"America/Puerto_Rico", AST},
{"America/Punta_Arenas", new String[] {"Punta Arenas Standard Time", "GMT-03:00",
"Punta Arenas Standard Time", "GMT-03:00",
"Punta Arenas Time", "GMT-03:00"}},
{"America/Rainy_River", CST},
{"America/Rankin_Inlet", CST},
{"America/Recife", BRT},
@ -630,6 +633,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
{"Asia/Dushanbe", new String[] {"Tajikistan Time", "TJT",
"Tajikistan Summer Time", "TJST",
"Tajikistan Time", "TJT"}},
{"Asia/Famagusta", EET},
{"Asia/Gaza", EET},
{"Asia/Harbin", CTT},
{"Asia/Hebron", EET},
@ -801,6 +805,9 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
{"Etc/Zulu", UTC},
{"Europe/Amsterdam", CET},
{"Europe/Andorra", CET},
{"Europe/Astrakhan", new String[] {"Astrakhan Standard Time", "GMT+04:00",
"Astrakhan Standard Time", "GMT+04:00",
"Astrakhan Time", "GMT+04:00"}},
{"Europe/Athens", EET},
{"Europe/Belfast", GMTBST},
{"Europe/Belgrade", CET},
@ -841,6 +848,9 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
"Samara Time", "SAMT"}},
{"Europe/San_Marino", CET},
{"Europe/Sarajevo", CET},
{"Europe/Saratov", new String[] {"Saratov Standard Time", "GMT+04:00",
"Saratov Standard Time", "GMT+04:00",
"Saratov Time", "GMT+04:00"}},
{"Europe/Simferopol", MSK},
{"Europe/Skopje", CET},
{"Europe/Sofia", EET},
@ -848,6 +858,9 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
{"Europe/Tallinn", EET},
{"Europe/Tirane", CET},
{"Europe/Tiraspol", EET},
{"Europe/Ulyanovsk", new String[] {"Ulyanovsk Standard Time", "GMT+04:00",
"Ulyanovsk Standard Time", "GMT+04:00",
"Ulyanovsk Time", "GMT+04:00"}},
{"Europe/Uzhgorod", EET},
{"Europe/Vaduz", CET},
{"Europe/Vatican", CET},