Changeset 17153 in josm

Timestamp:

2020-10-10T23:30:50+02:00 (4 years ago)

Author:

Klumbumbus

Message:

see #17809 - Don't promote spelling FIXME, deprecate Fixme in favor of fixme

Location:

trunk

Files:

• resources/data/validator/deprecated.mapcss (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (modified) (2 diffs)
• src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/dialogs/relation/actions/DuplicateRelationAction.java (modified) (1 diff)

trunk/resources/data/validator/deprecated.mapcss

@@ -2094 +2094 @@
 }
 
+/* #17809 */
+*[Fixme] {
+  throwWarning: tr("{0} is deprecated", "{0.key}");
+  suggestAlternative: "fixme";
+  group: tr("deprecated tagging");
+  fixChangeKey: "Fixme => fixme";
+  assertMatch: "way Fixme=foo";
+  assertNoMatch: "way fixme=foo";
+  assertNoMatch: "way FIXME=foo";
+}
+
 /* When tags are deprecated they should be added to ignoretags.cfg too. */

trunk/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java

@@ -1623 +1623 @@
     /**
      * Matches objects that don't have any interesting tags (i.e. only has source,
-     * FIXME, etc.). The complete list of uninteresting tags can be found here:
+     * fixme, etc.). The complete list of uninteresting tags can be found here:
      * org.openstreetmap.josm.data.osm.OsmPrimitive.getUninterestingKeys()
      */

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

@@ -628 +628 @@
             if (checkFixmes && key != null && value != null && !value.isEmpty() && isFixme(key, value) && !withErrors.contains(p, "FIXME")) {
                 errors.add(TestError.builder(this, Severity.OTHER, FIXME)
-                        .message(tr("FIXMES"))
+                        .message(tr("fixme"))
                         .primitives(p)
                         .build());
@@ -1106 +1106 @@
         testPanel.add(prefCheckValuesBeforeUpload, a);
 
-        prefCheckFixmes = new JCheckBox(tr("Check for FIXMES."), Config.getPref().getBoolean(PREF_CHECK_FIXMES, true));
-        prefCheckFixmes.setToolTipText(tr("Looks for nodes or ways with FIXME in any property value."));
+        prefCheckFixmes = new JCheckBox(tr("Check for fixme."), Config.getPref().getBoolean(PREF_CHECK_FIXMES, true));
+        prefCheckFixmes.setToolTipText(tr("Looks for nodes or ways with fixme in any property value."));
         testPanel.add(prefCheckFixmes, GBC.std().insets(20, 0, 0, 0));
 

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

@@ -64 +64 @@
             /* translation note: don't translate quoted words */
             errors.add(TestError.builder(this, Severity.WARNING, UNTAGGED_NODE_FIXME)
-                    .message(ERROR_MESSAGE, marktr("Has tag containing ''fixme'' or ''FIXME''"))
+                    .message(ERROR_MESSAGE, marktr("Has tag containing ''fixme''"))
                     .primitives(castPrim(n))
                     .build());

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/DuplicateRelationAction.java

@@ -25 +25 @@
         super(editorAccess);
         putValue(SHORT_DESCRIPTION, tr("Create a copy of this relation and open it in another editor window"));
-        // FIXME provide an icon
         new ImageProvider("duplicate").getResource().attachImageIcon(this, true);
         putValue(NAME, tr("Duplicate"));