Changeset 28977 in osm for applications/editors/josm

Timestamp:

2012-11-25T00:01:35+01:00 (12 years ago)

Author:

simon04

Message:

JOSM/FixAddresses: fix #josm8140 - i18n

Location:

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui

Files:

• IncompleteAddressesTableModel.java (modified) (2 diffs)
• UnresolvedAddressesTableModel.java (modified) (2 diffs)

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java

@@ -15 +15 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.trc;
 
 import java.util.Collections;
@@ -30 +31 @@
         // TODO: Add "state" column, if required
         private static final int NUMBER_OF_COLUMNS = 5;
-        private static final String[] COLUMN_NAMES = new String[]{tr("Country"), tr("City"), tr("Postcode"), tr("Street"), tr("Number")};
+        private static final String[] COLUMN_NAMES = new String[]{tr("Country"), trc("address", "City" /* fix #8140 */), tr("Postcode"), tr("Street"), tr("Number")};
         private static final Class<?>[] COLUMN_CLASSES = new Class<?>[]{
                 String.class, String.class, String.class, String.class, String.class, String.class};

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java

@@ -30 +30 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.trc;
 
 import java.util.Collections;
@@ -48 +49 @@
         private static final int NUMBER_OF_COLUMNS = 5;
         private static final String[] COLUMN_NAMES = new String[] { tr("Street"),
-                        tr("Number"), tr("City"), tr("Postcode"), tr("Name") };
+                        tr("Number"), trc("address", "City" /* fix #8140 */), tr("Postcode"), tr("Name") };
 
         private static final Class<?>[] COLUMN_CLASSES = new Class<?>[] {