From aa9b44a0bf778ed88c8ef185c0eb13f061543416 Mon Sep 17 00:00:00 2001 From: Quincy Morgan <2046746+quincylvania@users.noreply.github.com> Date: Tue, 22 Sep 2020 17:25:18 -0400 Subject: [PATCH] Add the `lang` attribute to issue messages (re: #7963) --- modules/validations/almost_junction.js | 6 +++--- modules/validations/close_nodes.js | 4 ++-- modules/validations/crossing_ways.js | 2 +- modules/validations/disconnected_way.js | 2 +- modules/validations/help_request.js | 2 +- modules/validations/impossible_oneway.js | 2 +- modules/validations/incompatible_source.js | 2 +- modules/validations/invalid_format.js | 4 ++-- modules/validations/mismatched_geometry.js | 8 ++++---- modules/validations/missing_role.js | 2 +- modules/validations/missing_tag.js | 2 +- modules/validations/outdated_tags.js | 4 ++-- modules/validations/private_data.js | 2 +- modules/validations/suspicious_name.js | 4 ++-- modules/validations/unsquare_way.js | 2 +- 15 files changed, 24 insertions(+), 24 deletions(-) diff --git a/modules/validations/almost_junction.js b/modules/validations/almost_junction.js index f74ff2c7b..ed5067e99 100644 --- a/modules/validations/almost_junction.js +++ b/modules/validations/almost_junction.js @@ -52,15 +52,15 @@ export function validationAlmostJunction(context) { type, subtype: 'highway-highway', severity: 'warning', - message(context) { + message: function(context) { const entity1 = context.hasEntity(this.entityIds[0]); if (this.entityIds[0] === this.entityIds[2]) { - return entity1 ? t('issues.almost_junction.self.message', { + return entity1 ? t.html('issues.almost_junction.self.message', { feature: utilDisplayLabel(entity1, context.graph()) }) : ''; } else { const entity2 = context.hasEntity(this.entityIds[2]); - return (entity1 && entity2) ? t('issues.almost_junction.message', { + return (entity1 && entity2) ? t.html('issues.almost_junction.message', { feature: utilDisplayLabel(entity1, context.graph()), feature2: utilDisplayLabel(entity2, context.graph()) }) : ''; diff --git a/modules/validations/close_nodes.js b/modules/validations/close_nodes.js index 3eae44fb9..11caa490c 100644 --- a/modules/validations/close_nodes.js +++ b/modules/validations/close_nodes.js @@ -168,7 +168,7 @@ export function validationCloseNodes(context) { message: function(context) { var entity = context.hasEntity(this.entityIds[0]), entity2 = context.hasEntity(this.entityIds[1]); - return (entity && entity2) ? t('issues.close_nodes.detached.message', { + return (entity && entity2) ? t.html('issues.close_nodes.detached.message', { feature: utilDisplayLabel(entity, context.graph()), feature2: utilDisplayLabel(entity2, context.graph()) }) : ''; @@ -233,7 +233,7 @@ export function validationCloseNodes(context) { severity: 'warning', message: function(context) { var entity = context.hasEntity(this.entityIds[0]); - return entity ? t('issues.close_nodes.message', { way: utilDisplayLabel(entity, context.graph()) }) : ''; + return entity ? t.html('issues.close_nodes.message', { way: utilDisplayLabel(entity, context.graph()) }) : ''; }, reference: showReference, entityIds: [way.id, node1.id, node2.id], diff --git a/modules/validations/crossing_ways.js b/modules/validations/crossing_ways.js index 4b73e1f7e..dcae5c603 100644 --- a/modules/validations/crossing_ways.js +++ b/modules/validations/crossing_ways.js @@ -403,7 +403,7 @@ export function validationCrossingWays(context) { var graph = context.graph(); var entity1 = graph.hasEntity(this.entityIds[0]), entity2 = graph.hasEntity(this.entityIds[1]); - return (entity1 && entity2) ? t('issues.crossing_ways.message', { + return (entity1 && entity2) ? t.html('issues.crossing_ways.message', { feature: utilDisplayLabel(entity1, graph), feature2: utilDisplayLabel(entity2, graph) }) : ''; diff --git a/modules/validations/disconnected_way.js b/modules/validations/disconnected_way.js index aa9c7b64f..56c6ea4ff 100644 --- a/modules/validations/disconnected_way.js +++ b/modules/validations/disconnected_way.js @@ -25,7 +25,7 @@ export function validationDisconnectedWay() { message: function(context) { var entity = this.entityIds.length && context.hasEntity(this.entityIds[0]); var label = entity && utilDisplayLabel(entity, context.graph()); - return t('issues.disconnected_way.routable.message', { count: this.entityIds.length, highway: label }); + return t.html('issues.disconnected_way.routable.message', { count: this.entityIds.length, highway: label }); }, reference: showReference, entityIds: Array.from(routingIslandWays).map(function(way) { return way.id; }), diff --git a/modules/validations/help_request.js b/modules/validations/help_request.js index 58df82576..070b45e80 100644 --- a/modules/validations/help_request.js +++ b/modules/validations/help_request.js @@ -25,7 +25,7 @@ export function validationHelpRequest(context) { severity: 'warning', message: function(context) { var entity = context.hasEntity(this.entityIds[0]); - return entity ? t('issues.fixme_tag.message', { feature: utilDisplayLabel(entity, context.graph()) }) : ''; + return entity ? t.html('issues.fixme_tag.message', { feature: utilDisplayLabel(entity, context.graph()) }) : ''; }, dynamicFixes: function() { return [ diff --git a/modules/validations/impossible_oneway.js b/modules/validations/impossible_oneway.js index f406435a6..d4293bf99 100644 --- a/modules/validations/impossible_oneway.js +++ b/modules/validations/impossible_oneway.js @@ -163,7 +163,7 @@ export function validationImpossibleOneway() { severity: 'warning', message: function(context) { var entity = context.hasEntity(this.entityIds[0]); - return entity ? t('issues.impossible_oneway.' + messageID + '.message', { + return entity ? t.html('issues.impossible_oneway.' + messageID + '.message', { feature: utilDisplayLabel(entity, context.graph()) }) : ''; }, diff --git a/modules/validations/incompatible_source.js b/modules/validations/incompatible_source.js index 6c5f98b44..3407f4385 100644 --- a/modules/validations/incompatible_source.js +++ b/modules/validations/incompatible_source.js @@ -34,7 +34,7 @@ export function validationIncompatibleSource() { severity: 'warning', message: function(context) { var entity = context.hasEntity(this.entityIds[0]); - return entity ? t('issues.incompatible_source.' + invalidSource.id + '.feature.message', { + return entity ? t.html('issues.incompatible_source.' + invalidSource.id + '.feature.message', { feature: utilDisplayLabel(entity, context.graph()) }) : ''; }, diff --git a/modules/validations/invalid_format.js b/modules/validations/invalid_format.js index f4b8c0fce..a2da5abc9 100644 --- a/modules/validations/invalid_format.js +++ b/modules/validations/invalid_format.js @@ -55,7 +55,7 @@ export function validationFormatting() { severity: 'warning', message: function(context) { var entity = context.hasEntity(this.entityIds[0]); - return entity ? t('issues.invalid_format.website.message' + this.data, + return entity ? t.html('issues.invalid_format.website.message' + this.data, { feature: utilDisplayLabel(entity, context.graph()), site: websites.join(', ') }) : ''; }, reference: showReferenceWebsite, @@ -80,7 +80,7 @@ export function validationFormatting() { severity: 'warning', message: function(context) { var entity = context.hasEntity(this.entityIds[0]); - return entity ? t('issues.invalid_format.email.message' + this.data, + return entity ? t.html('issues.invalid_format.email.message' + this.data, { feature: utilDisplayLabel(entity, context.graph()), email: emails.join(', ') }) : ''; }, reference: showReferenceEmail, diff --git a/modules/validations/mismatched_geometry.js b/modules/validations/mismatched_geometry.js index 60aa80996..3cfd81808 100644 --- a/modules/validations/mismatched_geometry.js +++ b/modules/validations/mismatched_geometry.js @@ -87,7 +87,7 @@ export function validationMismatchedGeometry() { severity: 'warning', message: function(context) { var entity = context.hasEntity(this.entityIds[0]); - return entity ? t('issues.tag_suggests_area.message', { + return entity ? t.html('issues.tag_suggests_area.message', { feature: utilDisplayLabel(entity, context.graph()), tag: utilTagText({ tags: tagSuggestingArea }) }) : ''; @@ -160,7 +160,7 @@ export function validationMismatchedGeometry() { severity: 'warning', message: function(context) { var entity = context.hasEntity(this.entityIds[0]); - return entity ? t('issues.vertex_as_point.message', { + return entity ? t.html('issues.vertex_as_point.message', { feature: utilDisplayLabel(entity, context.graph()) }) : ''; }, @@ -183,7 +183,7 @@ export function validationMismatchedGeometry() { severity: 'warning', message: function(context) { var entity = context.hasEntity(this.entityIds[0]); - return entity ? t('issues.point_as_vertex.message', { + return entity ? t.html('issues.point_as_vertex.message', { feature: utilDisplayLabel(entity, context.graph()) }) : ''; }, @@ -258,7 +258,7 @@ export function validationMismatchedGeometry() { severity: 'warning', message: function(context) { var entity = context.hasEntity(this.entityIds[0]); - return entity ? t('issues.unclosed_multipolygon_part.message', { + return entity ? t.html('issues.unclosed_multipolygon_part.message', { feature: utilDisplayLabel(entity, context.graph()) }) : ''; }, diff --git a/modules/validations/missing_role.js b/modules/validations/missing_role.js index cc8db32d8..60a3a1af2 100644 --- a/modules/validations/missing_role.js +++ b/modules/validations/missing_role.js @@ -44,7 +44,7 @@ export function validationMissingRole() { message: function(context) { var member = context.hasEntity(this.entityIds[1]), relation = context.hasEntity(this.entityIds[0]); - return (member && relation) ? t('issues.missing_role.message', { + return (member && relation) ? t.html('issues.missing_role.message', { member: utilDisplayLabel(member, context.graph()), relation: utilDisplayLabel(relation, context.graph()) }) : ''; diff --git a/modules/validations/missing_tag.js b/modules/validations/missing_tag.js index 2baaf0298..42a094889 100644 --- a/modules/validations/missing_tag.js +++ b/modules/validations/missing_tag.js @@ -84,7 +84,7 @@ export function validationMissingTag(context) { severity: severity, message: function(context) { var entity = context.hasEntity(this.entityIds[0]); - return entity ? t('issues.' + messageID + '.message', { + return entity ? t.html('issues.' + messageID + '.message', { feature: utilDisplayLabel(entity, context.graph()) }) : ''; }, diff --git a/modules/validations/outdated_tags.js b/modules/validations/outdated_tags.js index 37e7e679f..9c3af3948 100644 --- a/modules/validations/outdated_tags.js +++ b/modules/validations/outdated_tags.js @@ -215,7 +215,7 @@ export function validationOutdatedTags() { if (subtype === 'noncanonical_brand' && isOnlyAddingTags) { messageID += '_incomplete'; } - return t(messageID, { feature: utilDisplayLabel(currEntity, context.graph()) }); + return t.html(messageID, { feature: utilDisplayLabel(currEntity, context.graph()) }); } @@ -301,7 +301,7 @@ export function validationOutdatedTags() { let currMultipolygon = context.hasEntity(multipolygon.id); if (!currMultipolygon) return ''; - return t('issues.old_multipolygon.message', + return t.html('issues.old_multipolygon.message', { multipolygon: utilDisplayLabel(currMultipolygon, context.graph()) } ); } diff --git a/modules/validations/private_data.js b/modules/validations/private_data.js index cc1d8b59c..5515deda1 100644 --- a/modules/validations/private_data.js +++ b/modules/validations/private_data.js @@ -98,7 +98,7 @@ export function validationPrivateData() { var currEntity = context.hasEntity(this.entityIds[0]); if (!currEntity) return ''; - return t('issues.private_data.contact.message', + return t.html('issues.private_data.contact.message', { feature: utilDisplayLabel(currEntity, context.graph()) } ); } diff --git a/modules/validations/suspicious_name.js b/modules/validations/suspicious_name.js index 2411f5091..d5dda97fa 100644 --- a/modules/validations/suspicious_name.js +++ b/modules/validations/suspicious_name.js @@ -64,7 +64,7 @@ export function validationSuspiciousName() { if (!entity) return ''; let preset = presetManager.match(entity, context.graph()); let langName = langCode && localizer.languageName(langCode); - return t('issues.generic_name.message' + (langName ? '_language' : ''), + return t.html('issues.generic_name.message' + (langName ? '_language' : ''), { feature: preset.name(), name: genericName, language: langName } ); }, @@ -110,7 +110,7 @@ export function validationSuspiciousName() { if (!entity) return ''; const preset = presetManager.match(entity, context.graph()); const langName = langCode && localizer.languageName(langCode); - return t('issues.incorrect_name.message' + (langName ? '_language' : ''), + return t.html('issues.incorrect_name.message' + (langName ? '_language' : ''), { feature: preset.name(), name: incorrectName, language: langName } ); }, diff --git a/modules/validations/unsquare_way.js b/modules/validations/unsquare_way.js index ff8e8bea5..34803225f 100644 --- a/modules/validations/unsquare_way.js +++ b/modules/validations/unsquare_way.js @@ -76,7 +76,7 @@ export function validationUnsquareWay(context) { severity: 'warning', message: function(context) { var entity = context.hasEntity(this.entityIds[0]); - return entity ? t('issues.unsquare_way.message', { feature: utilDisplayLabel(entity, context.graph()) }) : ''; + return entity ? t.html('issues.unsquare_way.message', { feature: utilDisplayLabel(entity, context.graph()) }) : ''; }, reference: showReference, entityIds: [entity.id],