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

8282227: Locale information for nb is not working properly

Browse source 
Reviewed-by: rriggs
This commit is contained in:
Naoto Sato 2022-04-29 17:20:41 +00:00
parent cfe67af209
commit 3d07b3c7f0
2 changed files with 78 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/java.base/share/classes/sun/util/cldr/CLDRLocaleProviderAdapter.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2022, 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
@ -238,6 +238,8 @@ public class CLDRLocaleProviderAdapter extends JRELocaleProviderAdapter {
return applyParentLocales(baseName, candidates);
}
private static final Locale NB = Locale.forLanguageTag("nb");
private static final Locale NO = Locale.forLanguageTag("no");
private List<Locale> applyParentLocales(String baseName, List<Locale> candidates) {
// check irregular parents
for (int i = 0; i < candidates.size(); i++) {
@ -247,11 +249,15 @@ public class CLDRLocaleProviderAdapter extends JRELocaleProviderAdapter {
if (p != null &&
!candidates.get(i+1).equals(p)) {
List<Locale> applied = candidates.subList(0, i+1);
if (applied.contains(p)) {
// avoid circular recursion (could happen with nb/no case)
continue;
// Tweak for Norwegian locales, CLDR switched the canonical form of
// Norwegian Bokmal language code from "nb" to "no" in CLDR 39
// (https://unicode-org.atlassian.net/browse/CLDR-2698)
if (p.equals(NB) || p.equals(NO)) {
applied.add(NO);
applied.add(Locale.ROOT);
} else {
applied.addAll(applyParentLocales(baseName, super.getCandidateLocales(baseName, p)));
}
applied.addAll(applyParentLocales(baseName, super.getCandidateLocales(baseName, p)));
return applied;
}
}