Changeset 15475 in josm for trunk/src/org

Timestamp:

2019-10-26T00:20:52+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #18260 - restore correct entries in language drop down menu

File:

• trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java (modified) (3 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.tools;
 
-import java.util.Collection;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.Locale;
 
@@ -179 +179 @@
      */
     public static String getDisplayName(Locale locale) {
+        String currentCountry = Locale.getDefault().getCountry();
+        String localeCountry = locale.getCountry();
+        // Don't display locale country if country has been forced to current country at JOSM startup
+        if (currentCountry.equals(localeCountry) && !I18n.hasCode(getLanguageCodes(locale).get(0))) {
+            return new Locale(locale.getLanguage(), "", locale.getVariant()).getDisplayName();
+        }
         return locale.getDisplayName();
     }
@@ -263 +269 @@
      * @since 8283
      */
-    public static Collection<String> getLanguageCodes(Locale l) {
-        Collection<String> list = new LinkedList<>();
+    public static List<String> getLanguageCodes(Locale l) {
+        List<String> list = new LinkedList<>();
         if (l == null)
             l = Locale.getDefault();