Changeset 4144 in josm for trunk/src

Timestamp:

2011-06-19T12:11:45+02:00 (13 years ago)

Author:

stoecker

Message:

see #6064 - better handling of translation of relations

Location:

trunk/src/org/openstreetmap/josm

Files:

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

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 import static org.openstreetmap.josm.tools.I18n.trc;
+import static org.openstreetmap.josm.tools.I18n.trc_lazy;
 import static org.openstreetmap.josm.tools.I18n.trn;
 
@@ -372 +373 @@
             return null;
         } else
-            return relation.get(nameTag);
+            return trc_lazy(nameTag, relation.get(nameTag));
     }
 

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

@@ -160 +160 @@
     }
 
+    public static final String trc_lazy(String context, String text) {
+        if (context == null)
+            return tr(text);
+        if (text == null)
+            return null;
+        return MessageFormat.format(gettext_lazy(text, context), (Object)null);
+    }
+
     /**
      * Marks a string for translation (such that a script can harvest
@@ -218 +226 @@
         }
         return text;
+    }
+
+    /* try without context, when context try fails */
+    private static final String gettext_lazy(String text, String ctx)
+    {
+        int i;
+        if(ctx == null && text.startsWith("_:") && (i = text.indexOf("\n")) >= 0)
+        {
+            ctx = text.substring(2,i-1);
+            text = text.substring(i+1);
+        }
+        if(strings != null)
+        {
+            String trans = strings.get(ctx == null ? text : "_:"+ctx+"\n"+text);
+            if(trans != null)
+                return trans;
+        }
+        if(pstrings != null) {
+            String[] trans = pstrings.get(ctx == null ? text : "_:"+ctx+"\n"+text);
+            if(trans != null)
+                return trans[0];
+        }
+        return gettext(text, null);
     }