Ticket #3261: locale-name.patch

src/org/openstreetmap/josm/data/osm/Way.java

@@ -185 +185 @@
         if (incomplete) {
             name = tr("incomplete");
         } else {
-            name = get("name");
+            name = getNameTag();
             if (name == null) {
                 name = get("ref");
             }

src/org/openstreetmap/josm/data/osm/Relation.java

@@ -180 +180 @@
             }
             String nameTag = null;
             for (String n : names) {
-                nameTag = get(n);
+                nameTag = (n=="name") ? getNameTag() : get(n);
                 if (nameTag != null) {
                     break;
                 }

src/org/openstreetmap/josm/data/osm/Node.java

@@ -131 +131 @@
         if (incomplete) {
             name = tr("incomplete");
         } else {
-            name = get("name");
+            name = getNameTag();
             if (name == null) {
                 name = id == 0 ? tr("node") : ""+id;
             }

src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -9 +9 @@
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
 
@@ -334 +335 @@
         return keys == null ? null : keys.get(key);
     }
 
+    protected String getNameTag() {
+        String result = null;
+        if (Main.pref.getBoolean("tags.name.uselocale", true)) {
+            final String language = Locale.getDefault().getLanguage();
+            if (language != "") {
+                result = get("name:" + language);
+            }
+        }
+        if ((result == null) || (result == "")) {
+            result = get("name");
+        }
+        return result;
+    }
+
     public final Collection<Entry<String, String>> entrySet() {
         if (keys == null)
             return Collections.emptyList();