Changeset 7046 in josm for trunk/src/org/openstreetmap

Timestamp:

2014-05-02T01:40:37+02:00 (11 years ago)

Author:

Don-vip

Message:

see #9923 - update opening_hours.js + translate/shorten a bit error messages

File:

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

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

@@ -205 +205 @@
             }
             for (final Object i : getList(((Invocable) ENGINE).invokeMethod(r, "getErrors"))) {
-                errors.add(new OpeningHoursTestError(key + " - " + i.toString().trim(), Severity.ERROR, prettifiedValue));
+                errors.add(new OpeningHoursTestError(getErrorMessage(key, i), Severity.ERROR, prettifiedValue));
             }
             for (final Object i : getList(((Invocable) ENGINE).invokeMethod(r, "getWarnings"))) {
-                errors.add(new OpeningHoursTestError(i.toString().trim(), Severity.WARNING, prettifiedValue));
+                errors.add(new OpeningHoursTestError(getErrorMessage(key, i), Severity.WARNING, prettifiedValue));
             }
             if (!ignoreOtherSeverity && errors.isEmpty() && prettifiedValue != null && !value.equals(prettifiedValue)) {
@@ -217 +217 @@
         }
         return errors;
+    }
+    
+    /**
+     * Translates and shortens the error/warning message.
+     */
+    private String getErrorMessage(String key, Object o) {
+        String msg = o.toString().trim()
+        .replace("Unexpected token:", tr("Unexpected token:"))
+        .replace("Unexpected token (school holiday parser):", tr("Unexpected token (school holiday parser):"))
+        .replace("Unexpected token in number range:", tr("Unexpected token in number range:"))
+        .replace("Unexpected token in week range:", tr("Unexpected token in week range:"))
+        .replace("Unexpected token in weekday range:", tr("Unexpected token in weekday range:"))
+        .replace("Unexpected token in month range:", tr("Unexpected token in month range:"))
+        .replace("Unexpected token in year range:", tr("Unexpected token in year range:"))
+        .replace("This means that the syntax is not valid at that point or it is currently not supported.", tr("Invalid/unsupported syntax."));
+        return key + " - " + msg;
     }