Changeset 15661 in josm for trunk

Timestamp:

2020-01-08T23:03:36+01:00 (5 years ago)

Author:

simon04

Message:

fix #18388 - SystemOfMeasurement: primarily obtain country from LC_MEASUREMENT

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/SystemOfMeasurement.java (modified) (2 diffs)
• src/org/openstreetmap/josm/tools/LanguageInfo.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/tools/LanguageInfoTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/SystemOfMeasurement.java

@@ -16 +16 @@
 import org.openstreetmap.josm.data.preferences.StringProperty;
 import org.openstreetmap.josm.spi.preferences.Config;
+import org.openstreetmap.josm.tools.LanguageInfo;
 
 /**
@@ -289 +290 @@
      */
     public static SystemOfMeasurement getDefault() {
-        switch (Locale.getDefault().getCountry()) {
+        final String country = Optional.ofNullable(System.getenv("LC_MEASUREMENT"))
+                .map(LanguageInfo::getLocale)
+                .orElse(Locale.getDefault())
+                .getCountry();
+        switch (country) {
             case "US":
                 // https://en.wikipedia.org/wiki/Metrication_in_the_United_States#Current_use

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

@@ -203 +203 @@
      * Replies the locale used by Java for a given language code.
      *
-     * Accepts JOSM and Java codes as input.
+     * Accepts JOSM, Java and POSIX codes as input.
      *
      * @param localeName the locale code.
@@ -211 +211 @@
      */
     public static Locale getLocale(String localeName, boolean useDefaultCountry) {
+        final int encoding = localeName.indexOf('.');
+        if (encoding > 0) {
+            localeName = localeName.substring(0, encoding);
+        }
         int country = localeName.indexOf('_');
         int variant = localeName.indexOf('@');

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

@@ -63 +63 @@
 
     /**
+     * Unit test of {@link LanguageInfo#getLocale}.
+     */
+    @Test
+    public void testGetLocale() {
+        Assert.assertEquals(RU, LanguageInfo.getLocale("ru"));
+        Assert.assertEquals(EN_GB, LanguageInfo.getLocale("en_GB"));
+        Assert.assertEquals(CA_ES_VALENCIA, LanguageInfo.getLocale("ca_ES@valencia"));
+        Assert.assertEquals(DE_DE, LanguageInfo.getLocale("de_DE"));
+        Assert.assertEquals(DE_DE, LanguageInfo.getLocale("de_DE.UTF-8")); // LANG, LC_MEASUREMENT
+        Assert.assertEquals(PT_BR, LanguageInfo.getLocale("pt_BR.UTF-8")); // LANG, LC_MEASUREMENT
+    }
+
+    /**
      * Unit test of {@link LanguageInfo#getJOSMLocaleCode}.
      */