Changeset 3389 in josm for trunk/src/org

Timestamp:

2010-07-28T11:25:58+02:00 (14 years ago)

Author:

bastiK

Message:

fixed #5228 - type=line (bus-)relation is translated to "Freileitung (Starkstrom)" (power line)

Location:

trunk/src/org/openstreetmap/josm

Files:

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

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

@@ -3 +3 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.trc;
 import static org.openstreetmap.josm.tools.I18n.trn;
 
@@ -169 +170 @@
             name = tr("incomplete");
         } else {
-            name = tr(relation.get("type"));
+            name = trc("Relation type", relation.get("type"));
             if (name == null) {
                 name = (relation.get("public_transport") != null) ? tr("public transport") : "";

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

@@ -370 +370 @@
                 lhm.put(value_array[i], (locale_display_values == null)
                         ? (values_context == null ? tr(display_array[i])
-                                : tr(values_context, display_array[i])) : display_array[i]);
+                                : trc(values_context, display_array[i])) : display_array[i]);
             }
             if(!usage.unused()){

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

@@ -126 +126 @@
 
     public static final String trc(String ctx, String text) {
+        if (ctx == null)
+            return tr(text);
+        if (text == null)
+            return null;
         return MessageFormat.format(gettext(text, ctx), (Object)null);
     }