Changeset 15547 in josm for trunk/src/org/openstreetmap

Timestamp:

2019-11-30T18:53:35+01:00 (5 years ago)

Author:

Don-vip

Message:

fix #18355 - fix regression in determination of locale/country (introduced in r15395)

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• I18n.java (modified) (1 diff)
• LanguageInfo.java (modified) (2 diffs)

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

@@ -605 +605 @@
     public static void set(String localeName) {
         if (localeName != null) {
-            Locale l = LanguageInfo.getLocale(localeName);
+            Locale l = LanguageInfo.getLocale(localeName, true);
             if (load(LanguageInfo.getJOSMLocaleCode(l))) {
                 Locale.setDefault(l);

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

@@ -197 +197 @@
      */
     public static Locale getLocale(String localeName) {
+        return getLocale(localeName, false);
+    }
+
+    /**
+     * Replies the locale used by Java for a given language code.
+     *
+     * Accepts JOSM and Java codes as input.
+     *
+     * @param localeName the locale code.
+     * @param useDefaultCountry if {@code true}, the current locale country will be used if no country is specified
+     * @return the resulting locale
+     * @since 15547
+     */
+    public static Locale getLocale(String localeName, boolean useDefaultCountry) {
         int country = localeName.indexOf('_');
         int variant = localeName.indexOf('@');
@@ -209 +223 @@
             l = new Locale(localeName.substring(0, country), localeName.substring(country + 1));
         } else {
-            l = new Locale(localeName, Locale.getDefault().getCountry());
+            l = new Locale(localeName, useDefaultCountry ? Locale.getDefault().getCountry() : "");
         }
         return l;