archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +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;
}
}
}
}