Changeset 16078 in josm for trunk

Timestamp:

2020-03-08T14:34:12+01:00 (5 years ago)

Author:

GerdP

Message:

see #18643: I18n: improve plural forms

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java (modified) (4 diffs)

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

@@ -379 +379 @@
             if (errorCode == RINGS_SHARE_NODES) {
                 errors.add(TestError.builder(this, Severity.OTHER, errorCode)
-                        .message(tr("Multipolygon rings share nodes"))
+                        .message(tr("Multipolygon rings share node"))
                         .primitives(prims)
                         .highlight(sharedByPolygons)
@@ -577 +577 @@
                     } else if (loop == 0 || samePoly || (loop == 1 && !allInner)) {
                         String msg = loop == 0 ? tr("Intersection between multipolygon ways")
-                                : samePoly ? tr("Multipolygon ring contains segments twice")
-                                        : tr("Multipolygon outer way shares segments with other ring");
+                                : samePoly ? tr("Multipolygon ring contains segment twice")
+                                        : tr("Multipolygon outer way shares segment with other ring");
                         errors.add(TestError.builder(this, Severity.ERROR, CROSSING_WAYS)
                                 .message(msg)
@@ -693 +693 @@
     /**
      * Check for:<ul>
-     * <li>{@link #REPEATED_MEMBER_DIFF_ROLE}: Multipolygon members repeated with different role</li>
-     * <li>{@link #REPEATED_MEMBER_SAME_ROLE}: Multipolygon members repeated with same role</li>
+     * <li>{@link #REPEATED_MEMBER_DIFF_ROLE}: Multipolygon member repeated with different role</li>
+     * <li>{@link #REPEATED_MEMBER_SAME_ROLE}: Multipolygon member repeated with same role</li>
      * </ul>
      * @param r relation
@@ -738 +738 @@
                 }
             }
-            addRepeatedMemberError(r, repeatedDiffRole, REPEATED_MEMBER_DIFF_ROLE, tr("Multipolygon members repeated with different role"));
-            addRepeatedMemberError(r, repeatedSameRole, REPEATED_MEMBER_SAME_ROLE, tr("Multipolygon members repeated with same role"));
+            addRepeatedMemberError(r, repeatedDiffRole, REPEATED_MEMBER_DIFF_ROLE, tr("Multipolygon member repeated with different role"));
+            addRepeatedMemberError(r, repeatedSameRole, REPEATED_MEMBER_SAME_ROLE, tr("Multipolygon member repeated with same role"));
         }
         return hasDups;