Changeset 16072 in josm for trunk/src

Timestamp:

2020-03-08T10:37:59+01:00 (4 years ago)

Author:

simon04

Message:

see #18643 - I18n: improve plural forms

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/tests/TagChecker.java (modified) (2 diffs)
• gui/dialogs/SelectionListDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.trn;
 
 import java.awt.GridBagConstraints;
@@ -303 +304 @@
 
         if (errorSources.length() > 0)
-            throw new IOException(tr("Could not access data file(s):\n{0}", errorSources));
+            throw new IOException(trn(
+                    "Could not access data file:\n{0}",
+                    "Could not access data files:\n{0}", errorSources.length(), errorSources));
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

@@ -434 +434 @@
          */
         ZoomToListSelection() {
-            putValue(NAME, tr("Zoom to selected element(s)"));
-            putValue(SHORT_DESCRIPTION, tr("Zoom to selected element(s)"));
             new ImageProvider("dialogs/autoscale", "selection").getResource().attachImageIcon(this, true);
             updateEnabledState();
@@ -452 +450 @@
 
         protected void updateEnabledState() {
+            String name = trn("Zoom to selected element", "Zoom to selected elements", model.getSelected().size());
+            putValue(NAME, name);
+            putValue(SHORT_DESCRIPTION, name);
             setEnabled(!model.isSelectionEmpty());
         }