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

8181157: CLDR Timezone name fallback implementation

Browse source 
Reviewed-by: sherman, scolebourne
This commit is contained in:
Naoto Sato 2018-04-26 12:39:15 -07:00
parent 3105e04e1b
commit fafd844bc6
22 changed files with 639 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/java.base/share/classes/java/text/SimpleDateFormat.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -55,6 +55,7 @@ import java.util.concurrent.ConcurrentMap;
import sun.util.calendar.CalendarUtils;
import sun.util.calendar.ZoneInfoFile;
import sun.util.locale.provider.LocaleProviderAdapter;
import sun.util.locale.provider.TimeZoneNameUtility;
/**
* <code>SimpleDateFormat</code> is a concrete class for formatting and
@ -1691,6 +1692,12 @@ public class SimpleDateFormat extends DateFormat {
// Checking long and short zones [1 & 2],
// and long and short daylight [3 & 4].
String zoneName = zoneNames[i];
if (zoneName.isEmpty()) {
// fill in by retrieving single name
zoneName = TimeZoneNameUtility.retrieveDisplayName(
zoneNames[0], i >= 3, i % 2, locale);
zoneNames[i] = zoneName;
}
if (text.regionMatches(true, start,
zoneName, 0, zoneName.length())) {
return i;

6
src/java.base/share/classes/java/util/Locale.java
View file

@ -2189,9 +2189,9 @@ public final class Locale implements Cloneable, Serializable {
}
break;
case "tz":
displayType = TimeZoneNameUtility.retrieveGenericDisplayName(
TimeZoneNameUtility.convertLDMLShortID(type).orElse(type),
TimeZone.LONG, inLocale);
displayType = TimeZoneNameUtility.convertLDMLShortID(type)
.map(id -> TimeZoneNameUtility.retrieveGenericDisplayName(id, TimeZone.LONG, inLocale))
.orElse(type);
break;
}
ret = MessageFormat.format(lr.getLocaleName("ListKeyTypePattern"),