Changeset 32330 in osm

Timestamp:

2016-06-19T22:20:02+02:00 (8 years ago)

Author:

stoecker

Message:

fix #josm13004 - i18n error

Location:

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/gui

Files:

• IncompleteMembersDownloadDialog.java (modified) (1 diff)
• ProceedDialog.java (modified) (3 diffs)

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/gui/IncompleteMembersDownloadDialog.java

@@ -29 +29 @@
                 selectedOption = Integer.MIN_VALUE;
 
-                message = tr("The relation (id=" + id
-                                + ") has incomplete members.\nThey need to be downloaded to proceed with validation of this relation.\nDo you want to download incomplete members?");
+                message = tr("The relation (id={0}) has incomplete members.\n"+
+                    "They need to be downloaded to proceed with validation of this relation.\nDo you want to download incomplete members?", id);
                 checkbox = new JCheckBox(tr("Remember my choice and do not ask me again in this session"));
                 options = new String[2];

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/gui/ProceedDialog.java

@@ -2 +2 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.trn;
 
 import java.awt.Component;
@@ -38 +39 @@
                 panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
 
-                JLabel label1 = new JLabel(tr("PT_Assistant plugin found that this relation (id=" + id + ") has errors:"));
+                JLabel label1 = new JLabel(tr("PT_Assistant plugin found that this relation (id={0}) has errors:", id));
                 panel.add(label1);
                 label1.setAlignmentX(Component.LEFT_ALIGNMENT);
 
                 if (numberOfDirectionErrors != 0) {
-                        JLabel label2 = new JLabel("     " + numberOfDirectionErrors + tr(" direction errors"));
+                        JLabel label2 = new JLabel("     " + tr("{0} direction error", "{0} direction errors", numberOfDirectionErrors, numberOfDirectionErrors));
                         panel.add(label2);
                         label2.setAlignmentX(Component.LEFT_ALIGNMENT);
@@ -49 +50 @@
 
                 if (numberOfRoadTypeErrors != 0) {
-                        JLabel label3 = new JLabel("     " + numberOfRoadTypeErrors + tr(" road type errors"));
+                        JLabel label3 = new JLabel("     " + tr("{0} road type error", "{0} road type errors", numberOfRoadTypeErrors, numberOfRoadTypeErrors));
                         panel.add(label3);
                         label3.setAlignmentX(Component.LEFT_ALIGNMENT);