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

Timestamp:

2009-09-21T12:19:11+02:00 (15 years ago)

Author:

stoecker

Message:

further i18n context improvements

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/Filters.java (modified) (2 diffs)
• gui/layer/RawGpsLayer.java (modified) (2 diffs)
• tools/I18n.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/osm/Filters.java

@@ -2 +2 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.trc;
 
 import javax.swing.table.AbstractTableModel;
@@ -140 +141 @@
    public String getColumnName(int column){
       String[] names = { /* translators notes must be in front */
-          /* column header: enable filter */             tr("_: filter\nE"),
+          /* column header: enable filter */             tr("filter","E"),
           /* column header: hide filter */               tr("H"),
           /* column header: filter text */               tr("Text"),

trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java

@@ -5 +5 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 import static org.openstreetmap.josm.tools.I18n.trn;
+import static org.openstreetmap.josm.tools.I18n.trnc;
 
 import java.awt.Color;
@@ -156 +157 @@
             points += c.size();
         }
-        String tool = data.size()+" "+trn("_: gps\ntrack", "_: gps\ntracks", data.size())
+        String tool = data.size()+" "+trnc("gps", "track", "tracks", data.size())
         +" "+points+" "+trn("point", "points", points);
         File f = getAssociatedFile();

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

@@ -31 +31 @@
     public static final String tr(String text, Object... objects) {
         if (i18n == null)
-            return filter(MessageFormat.format(text, objects));
+            return MessageFormat.format(filter(text), objects);
         return filter(i18n.tr(text, objects));
     }
@@ -41 +41 @@
     }
 
+    public static final String trc(String ctx, String text) {
+        if (i18n == null)
+            return text;
+        return i18n.trc(ctx, text);
+    }
+
     public static final String marktr(String text) {
         return text;
@@ -47 +53 @@
     public static final String trn(String text, String pluralText, long n, Object... objects) {
         if (i18n == null)
-            return filter(n == 1 ? tr(text, objects) : tr(pluralText, objects));
+            return n == 1 ? tr(text, objects) : tr(pluralText, objects);
         return filter(i18n.trn(text, pluralText, n, objects));
     }
@@ -53 +59 @@
     public static final String trn(String text, String pluralText, long n) {
         if (i18n == null)
-            return filter(n == 1 ? tr(text) : tr(pluralText));
+            return n == 1 ? tr(text) : tr(pluralText);
         return filter(i18n.trn(text, pluralText, n));
+    }
+
+    public static final String trnc(String ctx, String text, String pluralText, long n, Object... objects) {
+        if (i18n == null)
+            return n == 1 ? tr(text, objects) : tr(pluralText, objects);
+        return i18n.trnc(ctx, text, pluralText, n, objects);
+    }
+
+    public static final String trnc(String ctx, String text, String pluralText, long n) {
+        if (i18n == null)
+            return n == 1 ? tr(text) : tr(pluralText);
+        return i18n.trnc(ctx, text, pluralText, n);
     }