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

8217366: ZoneStrings are not populated for all the Locales

Browse Source 
Reviewed-by: rriggs
This commit is contained in:
Naoto Sato 2019-01-23 15:43:01 -08:00
parent c6e45ea87c
commit a862610527
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/java.base/share/classes/sun/util/cldr/CLDRTimeZoneNameProviderImpl.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -148,6 +148,12 @@ public class CLDRTimeZoneNameProviderImpl extends TimeZoneNameProviderImpl {
private void deriveFallbackName(String[] names, int index, Locale locale, boolean noDST) { private void deriveFallbackName(String[] names, int index, Locale locale, boolean noDST) {
if (exists(names, index)) { if (exists(names, index)) {
if (names[index].equals(NO_INHERITANCE_MARKER)) {
// CLDR's "no inheritance marker"
names[index] = toGMTFormat(names[INDEX_TZID],
index == INDEX_DST_LONG || index == INDEX_DST_SHORT,
index % 2 != 0, locale);
}
return; return;
} }

26
test/jdk/java/util/TimeZone/CLDRDisplayNamesTest.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -73,6 +73,8 @@ public class CLDRDisplayNamesTest {
}, },
}; };
private static final String NO_INHERITANCE_MARKER = "\u2205\u2205\u2205";
public static void main(String[] args) { public static void main(String[] args) {
// Make sure that localized time zone names of CLDR are used // Make sure that localized time zone names of CLDR are used
// if specified. // if specified.
@ -131,5 +133,27 @@ public class CLDRDisplayNamesTest {
if (errors > 0) { if (errors > 0) {
throw new RuntimeException("test failed"); throw new RuntimeException("test failed");
} }
// 8217366: No "no inheritance marker" should be left in the returned array
// from DateFormatSymbols.getZoneStrings()
List.of(Locale.ROOT,
Locale.CHINA,
Locale.GERMANY,
Locale.JAPAN,
Locale.UK,
Locale.US,
Locale.forLanguageTag("hi-IN"),
Locale.forLanguageTag("es-419")).stream()
.peek(System.out::println)
.map(l -> DateFormatSymbols.getInstance(l).getZoneStrings())
.flatMap(zoneStrings -> Arrays.stream(zoneStrings))
.filter(namesArray -> Arrays.stream(namesArray)
.anyMatch(aName -> aName.equals(NO_INHERITANCE_MARKER)))
.findAny()
.ifPresentOrElse(marker -> {
throw new RuntimeException("No inheritance marker detected with tzid: "
+ marker[0]);
},
() -> System.out.println("Success: No \"no inheritance marker\" detected."));
} }
} }