Changeset 16660 in josm for trunk

Timestamp:

2020-06-16T20:21:16+02:00 (4 years ago)

Author:

simon04

Message:

fix #19397 - JosmDecimalFormatSymbolsProvider is not used for locale en_IE or de_AT

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java (modified) (2 diffs)
• src/org/openstreetmap/josm/tools/I18n.java (modified) (3 diffs)
• src/org/openstreetmap/josm/tools/JosmDecimalFormatSymbolsProvider.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/tools/JosmDecimalFormatSymbolsProviderTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java

@@ -6 +6 @@
 import java.awt.Component;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
@@ -85 +84 @@
         LanguageComboBoxModel() {
             data.add(0, null);
-            List<Locale> locales = Arrays.asList(I18n.getAvailableTranslations());
-            locales.sort(Comparator.comparing(Locale::getDisplayLanguage));
-            data.addAll(locales);
+            I18n.getAvailableTranslations()
+                    .sorted(Comparator.comparing(Locale::getDisplayLanguage))
+                    .forEachOrdered(data::add);
         }
 

trunk/src/org/openstreetmap/josm/tools/I18n.java

@@ -12 +12 @@
 import java.nio.file.InvalidPathException;
 import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Locale;
@@ -21 +17 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Stream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
@@ -362 +359 @@
      * @return an array of locale objects.
      */
-    public static Locale[] getAvailableTranslations() {
-        Collection<Locale> v = new ArrayList<>(languages.size());
-        if (getTranslationFile("en") != null) {
-            for (String loc : languages.keySet()) {
-                if (getTranslationFile(loc) != null) {
-                    v.add(LanguageInfo.getLocale(loc));
-                }
-            }
-        }
-        v.add(Locale.ENGLISH);
-        Locale[] l = new Locale[v.size()];
-        l = v.toArray(l);
-        Arrays.sort(l, Comparator.comparing(Locale::toString));
-        return l;
+    public static Stream<Locale> getAvailableTranslations() {
+        Stream<String> languages = Stream.concat(
+                getTranslationFile("en") != null ? I18n.languages.keySet().stream() : Stream.empty(),
+                Stream.of("en"));
+        return languages.filter(loc -> getTranslationFile(loc) != null).map(LanguageInfo::getLocale);
     }
 

trunk/src/org/openstreetmap/josm/tools/JosmDecimalFormatSymbolsProvider.java

@@ -5 +5 @@
 import java.text.spi.DecimalFormatSymbolsProvider;
 import java.util.Locale;
+import java.util.function.Function;
+import java.util.stream.Stream;
 
 /**
@@ -26 +28 @@
     @Override
     public Locale[] getAvailableLocales() {
-        return I18n.getAvailableTranslations();
+        return Stream.of(
+                Stream.of(Locale.ROOT),
+                Stream.of("", "AU", "IE", "US", "UK").map(country -> new Locale("en", country, "")),
+                Stream.of("", "AT", "CH", "DE").map(country -> new Locale("de", country, "")),
+                I18n.getAvailableTranslations()
+        ).flatMap(Function.identity()).toArray(Locale[]::new);
     }
 

trunk/test/unit/org/openstreetmap/josm/tools/JosmDecimalFormatSymbolsProviderTest.java

@@ -3 +3 @@
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
+import java.text.DecimalFormat;
 import java.util.Locale;
+import java.util.stream.Stream;
 
 import org.junit.Rule;
@@ -24 +27 @@
     public JOSMTestRules test = new JOSMTestRules();
 
+    @Test
+    public void testGroupingSeparator() {
+        checkGroupingSymbol(Locale.ROOT);
+        assertTrue(I18n.getAvailableTranslations().count() > 10);
+        I18n.getAvailableTranslations().forEach(this::checkGroupingSymbol);
+        Stream.of("", "AU", "IE", "US", "UK").map(country -> new Locale("en", country, "")).forEach(this::checkGroupingSymbol);
+        Stream.of("", "AT", "CH", "DE").map(country -> new Locale("de", country, "")).forEach(this::checkGroupingSymbol);
+    }
+
+    private void checkGroupingSymbol(Locale locale) {
+        assertEquals(locale.toString(), "123\u202F456", DecimalFormat.getInstance(locale).format(123_456));
+    }
+
     /**
      * Test {@link JosmDecimalFormatSymbolsProvider#parseDouble}.