Navigation Menu

Skip to content

Commit

Permalink
8295564: Norwegian Nynorsk Locale is missing formatting
Browse files Browse the repository at this point in the history
Reviewed-by: andrew
Backport-of: b37421e7578c108df87c24c93dcbc1f358f6c257
  • Loading branch information
GoeLin committed Apr 18, 2023
1 parent e91b87e commit 9eeb741
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
4 changes: 1 addition & 3 deletions make/jdk/src/classes/build/tools/cldrconverter/Bundle.java
Expand Up @@ -197,9 +197,7 @@ Map<String, Object> getTargetMap() throws Exception {
// parentsMap contains resources from id's parents.
Map<String, Object> 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.
Expand Down
8 changes: 8 additions & 0 deletions test/jdk/sun/text/resources/LocaleData.cldr
Expand Up @@ -8395,6 +8395,14 @@ 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

# tzdata2022f
TimeZoneNames/en/America\/Ojinaga/1=Central Standard Time
TimeZoneNames/en/America\/Chihuahua/1=Central Standard Time
2 changes: 1 addition & 1 deletion test/jdk/sun/text/resources/LocaleDataTest.java
Expand Up @@ -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 8296715
* 8251317 8274658 8283277 8296715 8295564
* @summary Verify locale data
* @modules java.base/sun.util.resources
* @modules jdk.localedata
Expand Down

1 comment on commit 9eeb741

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.