Changeset 4477 in josm

Timestamp:

2011-09-30T16:46:44+02:00 (13 years ago)

Author:

bastiK

Message:

fixed #6813 - Quote characters not displayed in relations "note" attribute (preliminary)

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/DefaultNameFormatter.java (modified) (2 diffs)
• tools/I18n.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java

@@ -32 +32 @@
 import org.openstreetmap.josm.data.osm.history.HistoryWay;
 import org.openstreetmap.josm.gui.tagging.TaggingPreset;
+import org.openstreetmap.josm.tools.I18n;
 import org.openstreetmap.josm.tools.TaggingPresetNameTemplateList;
 
@@ -472 +473 @@
             return null;
         } else
-            return trc_lazy(nameTag, relation.get(nameTag));
+            return trc_lazy(nameTag, I18n.escape(relation.get(nameTag)));
     }
 

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

@@ -300 +300 @@
 
         return num == 1 ? text : plural;
+    }
+
+    public static String escape(String msg) {
+        if (msg == null) return null;
+        return msg.replace("\'", "\'\'").replace("{", "\'{\'").replace("}", "\'}\'");
     }