Fix CLDRConverter to generate "java.time.long.Eras" for Gregorian Cal…

…endar
naotoj · Nov 2, 2023 · ad1ce04 · ad1ce04
1 parent e9328c8
commit ad1ce04
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/make/jdk/src/classes/build/tools/cldrconverter/Bundle.java b/make/jdk/src/classes/build/tools/cldrconverter/Bundle.java
@@ -513,10 +513,9 @@ private void adjustEraNames(Map<String, Object> map, Map<String, Object> pMap, C
                     value = new String[] {"", value[0]};
                     break;
                 }
-                if (!key.equals(realKey)) {
-                    map.put(realKey, value);
-                    map.put("java.time." + realKey, value);
-                }
+
+                map.put(realKey, value);
+                map.put("java.time." + realKey, value);
             }
             realKeys[index] = realKey;
             eraNames[index++] = value;

diff --git a/src/java.base/share/classes/sun/util/locale/provider/FallbackLocaleProviderAdapter.java b/src/java.base/share/classes/sun/util/locale/provider/FallbackLocaleProviderAdapter.java
@@ -51,7 +51,7 @@ protected Set<String> createLanguageTagSet(String category) {
         return switch (category) {
             case "BreakIteratorInfo", "BreakIteratorRules", "CollationData"
                     -> super.createLanguageTagSet(category);
-            case "FormatData" -> Set.of("ja-JP", "ja", "und");
+            case "FormatData" -> Set.of("ja", "und");
             default -> Set.of("und");
         };
     }

diff --git a/src/java.base/share/classes/sun/util/locale/provider/LocaleProviderAdapter.java b/src/java.base/share/classes/sun/util/locale/provider/LocaleProviderAdapter.java
@@ -144,8 +144,10 @@ public String getTextResourcesPackage() {
             // Default preference list.
             typeList.add(Type.CLDR);
         }
+
         // always append FALLBACK
         typeList.add(Type.FALLBACK);
+
         adapterPreference = Collections.unmodifiableList(typeList);
 
         // Emit logs, if any, after 'adapterPreference' is initialized which is needed