Changeset 6511 in josm for trunk/src/org

Timestamp:

2013-12-22T22:00:54+01:00 (10 years ago)

Author:

simon04

Message:

see #9414 - MapCSSTagChecker: handle tagging alternatives

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java (modified) (1 diff)

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

@@ -156 +156 @@
 
         /**
+         * Constructs a (localized) message for this deprecation check.
+         *
+         * @return a message
+         */
+        String getMessage() {
+            return errors.keySet().iterator().next();
+        }
+
+        /**
          * Constructs a (localized) description for this deprecation check.
          *
-         * @return a description
+         * @return a description (possibly with alternative suggestions)
          */
         String getDescription() {
-            return errors.keySet().iterator().next();
+            if (alternatives.isEmpty()) {
+                return getMessage();
+            } else {
+                /* I18N: {0} is the test error message and {1} is an alternative */
+                return tr("{0}, use {1} instead", getMessage(), Utils.join(tr(" or "), alternatives));
+            }
         }