Changeset 1579 in josm for trunk/src/org/openstreetmap

Timestamp:

2009-05-06T18:24:15+02:00 (16 years ago)

Author:

stoecker

Message:

fixed in-XML translation of presets

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• preferences/TaggingPresetPreference.java (modified) (1 diff)
• tagging/TaggingPreset.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java

@@ -150 +150 @@
                 {
                     JMenuItem mi = new JMenuItem(p);
-                    mi.setText(tr(p.name));
+                    mi.setText(p.getLocaleName());
                     m.add(mi);
                 }

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

@@ -63 +63 @@
     public TaggingPresetMenu group = null;
     public String name;
+    public String locale_name;
 
     public static abstract class Item {
@@ -441 +442 @@
         putValue("toolbar", "tagging_" + getRawName());
         putValue(SHORT_DESCRIPTION, (group != null ?
-        tr("Use preset ''{0}'' of group ''{1}''", tr(name), group.getName()) :
-        tr("Use preset ''{0}''", tr(name))));
+        tr("Use preset ''{0}'' of group ''{1}''", getLocaleName(), group.getName()) :
+        tr("Use preset ''{0}''", getLocaleName())));
+    }
+
+    public String getLocaleName() {
+        if(locale_name == null)
+            locale_name = tr(name);
+        return locale_name;
     }
 
     public String getName() {
-        return group != null ? group.getName() + "/" + tr(name) : tr(name);
+        return group != null ? group.getName() + "/" + getLocaleName() : getLocaleName();
     }
     public String getRawName() {