Changeset 19070 in josm

Timestamp:

2024-05-02T15:34:26+02:00 (5 weeks ago)

Author:

stoecker

Message:

see #23627 - use getOSMLocaleCodes also for naming primitives

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/IPrimitive.java (modified) (1 diff)
• tools/LanguageInfo.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/IPrimitive.java

@@ -381 +381 @@
      *
      * @return the name of this primitive, <code>null</code> if no name exists
-     * @see LanguageInfo#getLanguageCodes
+     * @see LanguageInfo#getOSMLocaleCodes
      */
     default String getLocalName() {
-        for (String s : LanguageInfo.getLanguageCodes(null)) {
-            String val = get("name:" + s);
+        for (String s : LanguageInfo.getOSMLocaleCodes("name:")) {
+            String val = get(s);
             if (val != null)
                 return val;

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

@@ -191 +191 @@
                 return new String[]{prefix+"zh-Hant-TW", prefix+"zh-Hant", prefix+"zh"};
             default:
-                return new String[]{prefix+main};
+                ArrayList<String> r = new ArrayList<String>();
+                for (String s : LanguageInfo.getLanguageCodes(null)) {
+                    r.add(prefix + s);
+                }
+                return r.toArray(String[]::new);
         }
     }