CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-03-22 19:13:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add the lang attribute to issue messages (re: #7963)

Browse Source
This commit is contained in:
Quincy Morgan
2020-09-22 17:25:18 -04:00
parent ab2b6f3123
commit aa9b44a0bf
15 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/validations/almost_junction.js
View File

@@ -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())
}) : '';

4
modules/validations/close_nodes.js
View File

@@ -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],

2
modules/validations/crossing_ways.js
View File

@@ -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)
}) : '';

2
modules/validations/disconnected_way.js
View File

@@ -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; }),

2
modules/validations/help_request.js
View File

@@ -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 [

2
modules/validations/impossible_oneway.js
View File

@@ -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())
}) : '';
},

2
modules/validations/incompatible_source.js
View File

@@ -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())
}) : '';
},

4
modules/validations/invalid_format.js
View File

@@ -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,

8
modules/validations/mismatched_geometry.js
View File

@@ -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())
}) : '';
},

2
modules/validations/missing_role.js
View File

@@ -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())
}) : '';

2
modules/validations/missing_tag.js
View File

@@ -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())
}) : '';
},

4
modules/validations/outdated_tags.js
View File

@@ -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()) }
);
}

2
modules/validations/private_data.js
View File

@@ -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()) }
);
}

4
modules/validations/suspicious_name.js
View File

@@ -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 }
);
},

2
modules/validations/unsquare_way.js
View File

@@ -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],