en-US support for BreakIterator/Collator in Fallback provider

naotoj · Nov 6, 2023 · c0a93f5 · c0a93f5
1 parent ffef327
commit c0a93f5
Showing 1 changed file with 8 additions and 2 deletions.
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
@@ -25,6 +25,8 @@
 
 package sun.util.locale.provider;
 
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.Set;
 
 /*
@@ -49,8 +51,12 @@ public LocaleProviderAdapter.Type getAdapterType() {
     @Override
     protected Set<String> createLanguageTagSet(String category) {
         return switch (category) {
-            case "BreakIteratorInfo", "BreakIteratorRules", "CollationData"
-                    -> super.createLanguageTagSet(category);
+            case "BreakIteratorInfo", "BreakIteratorRules", "CollationData" -> {
+                // ensure to include en-US
+                var s = new HashSet<>(super.createLanguageTagSet(category));
+                s.add("en-US");
+                yield Collections.unmodifiableSet(s);
+            }
             case "FormatData" -> Set.of("ja", "und");
             default -> Set.of("und");
         };