Changeset 5181 in josm

Timestamp:

Apr 14, 2012 12:01:16 PM (13 months ago)

Author:

simon04

Message:

fix #7606 - Values in presets get translated

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

@@ -321 +321 @@
             if (value.equals(DIFFERENT))
                 return DIFFERENT;
-            return display_value == null ? value : display_value.replaceAll("<.*>", ""); // remove additional markup, e.g. <br>
+            return getDisplayValue(true).replaceAll("<.*>", ""); // remove additional markup, e.g. <br>
         }
     }
@@ -592 +592 @@
                 locale_text = trc(text_context, fixPresetString(text));
             }
-            p.add(new JLabel(locale_text + ":"), GBC.std().insets(0, 0, 10, 0));
+            p.add(new JLabel(tr("{0}:", locale_text)), GBC.std().insets(0, 0, 10, 0));
 
             addToPanelAnchor(p, default_, display_array);
@@ -635 +635 @@
                 }
                 lhm.put(value_array[i], e);
+                display_array[i] = e.getDisplayValue(true);
             }
 
@@ -665 +666 @@
                     if (k != null && k.equals(display)) {
                         value = key;
+                        break;
                     }
                 }