Re-organizes issue messages and tooltips

data/core.yaml

@@ -622,24 +622,6 @@ en:
     description: Description
     on_wiki: "{tag} on wiki.osm.org"
     used_with: "used with {type}"
-  validations:
-    disconnected_highway: "{entityLabel} is disconnected from other highways."
-    disconnected_highway_tooltip: "Roads should be connected to other roads or building entrances."
-    old_multipolygon: Multipolygon tags on outer way
-    old_multipolygon_tooltip: "This style of multipolygon is deprecated. Please assign the tags to the parent multipolygon instead of the outer way."
-    untagged_point: Untagged point
-    untagged_point_tooltip: "Select a feature type that describes what this point is."
-    untagged_line: Untagged line
-    untagged_line_tooltip: "Select a feature type that describes what this line is."
-    untagged_area: Untagged area
-    untagged_area_tooltip: "Select a feature type that describes what this area is."
-    untagged_relation: Untagged relation
-    untagged_relation_tooltip: "Select a feature type that describes what this relation is."
-    many_deletions: "You're deleting {n} features: {p} nodes, {l} lines, {a} areas, {r} relations. Are you sure you want to do this? This will delete them from the map that everyone else sees on openstreetmap.org."
-    tag_suggests_area: "The tag {tag} suggests line should be area, but it is not an area"
-    deprecated_tags: "Deprecated tags: {tags}"
-    crossing_ways: Crossing ways without connection
-    crossing_ways_tooltip: "Roads are crossing other roads, buildings, railroads, or waterways without connection nodes or a bridge tag."
   zoom:
     in: Zoom in
     out: Zoom out
@@ -900,6 +882,33 @@ en:
     severity:
       error: error
       warning: warning
+    disconnected_highway:
+      message: "{entityLabel} is disconnected from other highways."
+      tooltip: "Roads should be connected to other roads or building entrances."
+    old_multipolygon:
+      message: Multipolygon tags on outer way
+      tooltip: "This style of multipolygon is deprecated. Please assign the tags to the parent multipolygon instead of the outer way."
+    untagged_point:
+      message: Untagged point
+      tooltip: "Select a feature type that describes what this point is."
+    untagged_line:
+      message: Untagged line
+      tooltip: "Select a feature type that describes what this line is."
+    untagged_area:
+      message: Untagged area
+      tooltip: "Select a feature type that describes what this area is."
+    untagged_relation:
+      message: Untagged relation
+      tooltip: "Select a feature type that describes what this relation is."
+    many_deletions:
+      message: "You're deleting {n} features: {p} nodes, {l} lines, {a} areas, {r} relations. Are you sure you want to do this? This will delete them from the map that everyone else sees on openstreetmap.org."
+    tag_suggests_area:
+      message: "The tag {tag} suggests line should be area, but it is not an area"
+    deprecated_tags:
+      message: "Deprecated tags: {tags}"
+    crossing_ways:
+      message: Crossing ways without connection
+      tooltip: "Roads are crossing other roads, buildings, railroads, or waterways without connection nodes or a bridge tag."
   intro:
     done: done
     ok: OK

dist/locales/en.json

@@ -759,25 +759,6 @@
             "on_wiki": "{tag} on wiki.osm.org",
             "used_with": "used with {type}"
         },
-        "validations": {
-            "disconnected_highway": "{entityLabel} is disconnected from other highways.",
-            "disconnected_highway_tooltip": "Roads should be connected to other roads or building entrances.",
-            "old_multipolygon": "Multipolygon tags on outer way",
-            "old_multipolygon_tooltip": "This style of multipolygon is deprecated. Please assign the tags to the parent multipolygon instead of the outer way.",
-            "untagged_point": "Untagged point",
-            "untagged_point_tooltip": "Select a feature type that describes what this point is.",
-            "untagged_line": "Untagged line",
-            "untagged_line_tooltip": "Select a feature type that describes what this line is.",
-            "untagged_area": "Untagged area",
-            "untagged_area_tooltip": "Select a feature type that describes what this area is.",
-            "untagged_relation": "Untagged relation",
-            "untagged_relation_tooltip": "Select a feature type that describes what this relation is.",
-            "many_deletions": "You're deleting {n} features: {p} nodes, {l} lines, {a} areas, {r} relations. Are you sure you want to do this? This will delete them from the map that everyone else sees on openstreetmap.org.",
-            "tag_suggests_area": "The tag {tag} suggests line should be area, but it is not an area",
-            "deprecated_tags": "Deprecated tags: {tags}",
-            "crossing_ways": "Crossing ways without connection",
-            "crossing_ways_tooltip": "Roads are crossing other roads, buildings, railroads, or waterways without connection nodes or a bridge tag."
-        },
         "zoom": {
             "in": "Zoom in",
             "out": "Zoom out"
@@ -1070,6 +1051,43 @@
             "severity": {
                 "error": "error",
                 "warning": "warning"
+            },
+            "disconnected_highway": {
+                "message": "{entityLabel} is disconnected from other highways.",
+                "tooltip": "Roads should be connected to other roads or building entrances."
+            },
+            "old_multipolygon": {
+                "message": "Multipolygon tags on outer way",
+                "tooltip": "This style of multipolygon is deprecated. Please assign the tags to the parent multipolygon instead of the outer way."
+            },
+            "untagged_point": {
+                "message": "Untagged point",
+                "tooltip": "Select a feature type that describes what this point is."
+            },
+            "untagged_line": {
+                "message": "Untagged line",
+                "tooltip": "Select a feature type that describes what this line is."
+            },
+            "untagged_area": {
+                "message": "Untagged area",
+                "tooltip": "Select a feature type that describes what this area is."
+            },
+            "untagged_relation": {
+                "message": "Untagged relation",
+                "tooltip": "Select a feature type that describes what this relation is."
+            },
+            "many_deletions": {
+                "message": "You're deleting {n} features: {p} nodes, {l} lines, {a} areas, {r} relations. Are you sure you want to do this? This will delete them from the map that everyone else sees on openstreetmap.org."
+            },
+            "tag_suggests_area": {
+                "message": "The tag {tag} suggests line should be area, but it is not an area"
+            },
+            "deprecated_tags": {
+                "message": "Deprecated tags: {tags}"
+            },
+            "crossing_ways": {
+                "message": "Crossing ways without connection",
+                "tooltip": "Roads are crossing other roads, buildings, railroads, or waterways without connection nodes or a bridge tag."
             }
         },
         "intro": {

modules/validations/crossing_ways.js

@@ -96,8 +96,8 @@ export function validationHighwayCrossingOtherWays() {
                 issues.push(new validationIssue({
                     type: ValidationIssueType.crossing_ways,
                     severity: ValidationIssueSeverity.error,
-                    message: t('validations.crossing_ways'),
-                    tooltip: t('validations.crossing_ways_tooltip'),
+                    message: t('issues.crossing_ways.message'),
+                    tooltip: t('issues.crossing_ways.tooltip'),
                     entities: crosses[j].ways,
                     coordinates: crosses[j].cross_point,
                 }));

modules/validations/deprecated_tag.js

@@ -22,7 +22,7 @@ export function validationDeprecatedTag() {
                 issues.push(new validationIssue({
                     type: ValidationIssueType.deprecated_tags,
                     severity: ValidationIssueSeverity.warning,
-                    message: t('validations.deprecated_tags', { tags: tags }),
+                    message: t('issues.deprecated_tags.message', { tags: tags }),
                     entities: [change],
                 }));
             }

modules/validations/disconnected_highway.js

@@ -50,8 +50,8 @@ export function validationDisconnectedHighway(context) {
                 issues.push(new validationIssue({
                     type: ValidationIssueType.disconnected_highway,
                     severity: ValidationIssueSeverity.warning,
-                    message: t('validations.disconnected_highway', {entityLabel: entityLabel}),
-                    tooltip: t('validations.disconnected_highway_tooltip'),
+                    message: t('issues.disconnected_highway.message', {entityLabel: entityLabel}),
+                    tooltip: t('issues.disconnected_highway.tooltip'),
                     entities: [entity],
                 }));
             }

modules/validations/many_deletions.js

@@ -23,7 +23,7 @@ export function validationManyDeletions() {
                 type: ValidationIssueType.many_deletions,
                 severity: ValidationIssueSeverity.warning,
                 message: t(
-                    'validations.many_deletions',
+                    'issues.many_deletions.message',
                     { n: changes.deleted.length, p: nodes, l: ways, a:areas, r: relations }
                 ),
             }));

modules/validations/missing_tag.js

@@ -26,8 +26,8 @@ export function validationMissingTag() {
                 issues.push(new validationIssue({
                     type: ValidationIssueType.missing_tag,
                     severity: ValidationIssueSeverity.error,
-                    message: t('validations.untagged_' + geometry),
-                    tooltip: t('validations.untagged_' + geometry + '_tooltip'),
+                    message: t('issues.untagged_' + geometry + '.message'),
+                    tooltip: t('issues.untagged_' + geometry + '.tooltip'),
                     entities: [change],
                 }));
             }

modules/validations/old_multipolygon.js

@@ -17,8 +17,8 @@ export function validationOldMultipolygon() {
                 issues.push(new validationIssue({
                     type: ValidationIssueType.old_multipolygon,
                     severity: ValidationIssueSeverity.warning,
-                    message: t('validations.old_multipolygon'),
-                    tooltip: t('validations.old_multipolygon_tooltip'),
+                    message: t('issues.old_multipolygon.message'),
+                    tooltip: t('issues.old_multipolygon.tooltip'),
                     entities: [parent],
                 }));
             }

modules/validations/tag_suggests_area.js

@@ -40,7 +40,7 @@ export function validationTagSuggestsArea() {
                 issues.push(new validationIssue({
                     type: ValidationIssueType.tag_suggests_area,
                     severity: ValidationIssueSeverity.warning,
-                    message: t('validations.tag_suggests_area', { tag: suggestion }),
+                    message: t('issues.tag_suggests_area.message', { tag: suggestion }),
                     entities: [change],
                 }));
             }