From b37421e7578c108df87c24c93dcbc1f358f6c257 Mon Sep 17 00:00:00 2001 From: Naoto Sato Date: Thu, 20 Oct 2022 15:59:22 +0000 Subject: [PATCH] 8295564: Norwegian Nynorsk Locale is missing formatting Reviewed-by: iris, joehw --- .../jdk/src/classes/build/tools/cldrconverter/Bundle.java | 4 +--- test/jdk/sun/text/resources/LocaleData.cldr | 8 ++++++++ test/jdk/sun/text/resources/LocaleDataTest.java | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/make/jdk/src/classes/build/tools/cldrconverter/Bundle.java b/make/jdk/src/classes/build/tools/cldrconverter/Bundle.java index e8076478a06..64d36544cf3 100644 --- a/make/jdk/src/classes/build/tools/cldrconverter/Bundle.java +++ b/make/jdk/src/classes/build/tools/cldrconverter/Bundle.java @@ -205,9 +205,7 @@ class Bundle { // parentsMap contains resources from id's parents. Map parentsMap = new HashMap<>(); for (int i = cldrBundles.length - 1; i > index; i--) { - if (!("no".equals(cldrBundles[i]) || cldrBundles[i].startsWith("no_"))) { - parentsMap.putAll(CLDRConverter.getCLDRBundle(cldrBundles[i])); - } + parentsMap.putAll(CLDRConverter.getCLDRBundle(cldrBundles[i])); } // Duplicate myMap as parentsMap for "root" so that the // fallback works. This is a hack, though. diff --git a/test/jdk/sun/text/resources/LocaleData.cldr b/test/jdk/sun/text/resources/LocaleData.cldr index 1282c42288f..7400c4c7a6f 100644 --- a/test/jdk/sun/text/resources/LocaleData.cldr +++ b/test/jdk/sun/text/resources/LocaleData.cldr @@ -8394,3 +8394,11 @@ FormatData/de/latn.NumberElements/12= FormatData/de_AT/latn.NumberElements/12=. FormatData/fr/latn.NumberElements/11= FormatData/fr_CH/latn.NumberElements/11=. + +# bug # 8295564 +FormatData/nb/latn.NumberElements/0=, +FormatData/nb/latn.NumberElements/1=\u00a0 +FormatData/no/latn.NumberElements/0=, +FormatData/no/latn.NumberElements/1=\u00a0 +FormatData/nn/latn.NumberElements/0=, +FormatData/nn/latn.NumberElements/1=\u00a0 diff --git a/test/jdk/sun/text/resources/LocaleDataTest.java b/test/jdk/sun/text/resources/LocaleDataTest.java index ee58542fda1..2dc4b07f807 100644 --- a/test/jdk/sun/text/resources/LocaleDataTest.java +++ b/test/jdk/sun/text/resources/LocaleDataTest.java @@ -40,7 +40,7 @@ * 8145136 8145952 8164784 8037111 8081643 7037368 8178872 8185841 8190918 * 8187946 8195478 8181157 8179071 8193552 8202026 8204269 8202537 8208746 * 8209775 8221432 8227127 8230284 8231273 8233579 8234288 8250665 8255086 - * 8251317 8274658 8283277 8283805 8265315 8287868 + * 8251317 8274658 8283277 8283805 8265315 8287868 8295564 * @summary Verify locale data * @modules java.base/sun.util.resources * @modules jdk.localedata