Changeset 11466 in josm for trunk/src/org

Timestamp:

2017-01-16T17:00:33+01:00 (8 years ago)

Author:

bastiK

Message:

fixed #14252 - do not translate relation roles; add apostrophes

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/tests/RelationChecker.java (modified) (6 diffs)
• gui/NavigatableComponent.java (modified) (1 diff)

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

@@ -29 +29 @@
 import org.openstreetmap.josm.gui.tagging.presets.items.Roles;
 import org.openstreetmap.josm.gui.tagging.presets.items.Roles.Role;
-import org.openstreetmap.josm.tools.I18n;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -76 +75 @@
     }
 
-    private static Collection<TaggingPreset> relationpresets = new LinkedList<>();
+    private static final Collection<TaggingPreset> relationpresets = new LinkedList<>();
 
     /**
@@ -238 +237 @@
                             possibleMatchError = TestError.builder(this, Severity.WARNING, WRONG_TYPE)
                                     .message(ROLE_VERIF_PROBLEM_MSG,
-                                            marktr("Role member does not match expression {0} in template {1}"),
+                                            marktr("Role member does not match expression ''{0}'' in template {1}"),
                                             r.memberExpression, rolePreset.name)
                                     .primitives(member.getMember().isUsable() ? member.getMember() : n)
@@ -272 +271 @@
             errors.add(TestError.builder(this, Severity.WARNING, WRONG_TYPE)
                     .message(ROLE_VERIF_PROBLEM_MSG,
-                            marktr("Role member type {0} does not match accepted list of {1} in template {2}"),
+                            marktr("Role member type ''{0}'' does not match accepted list of ''{1}'' in template {2}"),
                             member.getType(), typesStr, rolePreset.name)
                     .primitives(member.getMember().isUsable() ? member.getMember() : n)
@@ -308 +307 @@
         for (String key : map.keySet()) {
             if (!allroles.containsKey(key)) {
-                String templates = allroles.keySet().stream().map(I18n::tr).collect(Collectors.joining("/"));
+                String templates = allroles.keySet().stream().collect(Collectors.joining("/"));
 
                 if (!key.isEmpty()) {
 
                     errors.add(TestError.builder(this, Severity.WARNING, ROLE_UNKNOWN)
-                            .message(ROLE_VERIF_PROBLEM_MSG, marktr("Role {0} unknown in templates {1}"), key, templates)
+                            .message(ROLE_VERIF_PROBLEM_MSG, marktr("Role ''{0}'' unknown in templates ''{1}''"), key, templates)
                             .primitives(n)
                             .build());
                 } else {
                     errors.add(TestError.builder(this, Severity.WARNING, ROLE_EMPTY)
-                            .message(ROLE_VERIF_PROBLEM_MSG, marktr("Empty role type found when expecting one of {0}"), templates)
+                            .message(ROLE_VERIF_PROBLEM_MSG, marktr("Empty role type found when expecting one of ''{0}''"), templates)
                             .primitives(n)
                             .build());
@@ -332 +331 @@
             if (count == 0) {
                 errors.add(TestError.builder(this, Severity.WARNING, ROLE_MISSING)
-                        .message(ROLE_VERIF_PROBLEM_MSG, marktr("Role {0} missing"), keyname)
+                        .message(ROLE_VERIF_PROBLEM_MSG, marktr("Role ''{0}'' missing"), keyname)
                         .primitives(n)
                         .build());
             } else if (vc > count) {
                 errors.add(TestError.builder(this, Severity.WARNING, LOW_COUNT)
-                        .message(ROLE_VERIF_PROBLEM_MSG, marktr("Number of {0} roles too low ({1})"), keyname, count)
+                        .message(ROLE_VERIF_PROBLEM_MSG, marktr("Number of ''{0}'' roles too low ({1})"), keyname, count)
                         .primitives(n)
                         .build());
             } else {
                 errors.add(TestError.builder(this, Severity.WARNING, HIGH_COUNT)
-                        .message(ROLE_VERIF_PROBLEM_MSG, marktr("Number of {0} roles too high ({1})"), keyname, count)
+                        .message(ROLE_VERIF_PROBLEM_MSG, marktr("Number of ''{0}'' roles too high ({1})"), keyname, count)
                         .primitives(n)
                         .build());

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -325 +325 @@
      * Changes the projection settings used for this map view.
      * <p>
-     * Made public temporarely, will be made private later.
+     * Made public temporarily, will be made private later.
      */
     public void fixProjection() {