Changeset 16372 in josm

Timestamp:

2020-04-21T08:13:51+02:00 (4 years ago)

Author:

GerdP

Message:

fix #18138: Validator rules for connectivity relations
fix single quotes in i18n string, improve wording

File:

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

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

@@ -127 +127 @@
             if (!r.hasKey(CONNECTIVITY_TAG)) {
                 errors.add(TestError.builder(this, Severity.WARNING, NO_CONNECTIVITY_TAG)
-                        .message(tr("No 'connectivity' tag in connectivity relation")).primitives(r).build());
+                        .message(tr("Connectivity relation without connectivity tag")).primitives(r).build());
             } else if (!r.hasIncompleteMembers()) {
                 boolean badRole = checkForBadRole(r);
@@ -230 +230 @@
         } else if (!defaultLanes) {
             errors.add(TestError.builder(this, Severity.WARNING, MEMBER_MISSING_LANES)
-                    .message(trn("Relation {0} member missing lanes tag", "Relation {0} members missing 'lanes' or '*:lanes' tag",
-                            lanelessRolesCount, lanelessRoles)).primitives(relation)
-                    .build());
+                    .message(trn("Relation {0} member is missing a lanes or *:lanes tag",
+                            "Relation {0} members are missing a lanes or *:lanes tag", lanelessRolesCount,
+                            lanelessRoles))
+                    .primitives(relation).build());
         }
         return roleLanes;
@@ -400 +401 @@
         if (viaNodes > 1) {
             if (viaWays > 0) {
-                message = tr("Relation should not contain mixed 'via' ways and nodes");
+                message = tr("Relation should not contain mixed ''via'' ways and nodes");
             } else {
-                message = tr("Multiple 'via' roles only allowed with ways");
+                message = tr("Multiple ''via'' roles only allowed with ways");
             }
         }