From b5fdb145f5c49dcbe7f91d5b4ffc7242e1d37157 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Fri, 19 Nov 2021 12:23:45 +0100 Subject: [PATCH] add more explicit html formatting of translated texts --- modules/ui/feature_info.js | 2 +- modules/ui/panels/measurement.js | 2 +- modules/ui/sections/changes.js | 2 +- modules/ui/sections/entity_issues.js | 2 +- modules/ui/sections/raw_member_editor.js | 2 +- modules/ui/sections/raw_membership_editor.js | 2 +- modules/ui/sections/raw_tag_editor.js | 2 +- modules/ui/sections/selection_list.js | 2 +- modules/ui/sections/validation_issues.js | 2 +- modules/ui/sections/validation_status.js | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/ui/feature_info.js b/modules/ui/feature_info.js index 5a745c326..3682653a3 100644 --- a/modules/ui/feature_info.js +++ b/modules/ui/feature_info.js @@ -9,7 +9,7 @@ export function uiFeatureInfo(context) { var hiddenList = features.hidden().map(function(k) { if (stats[k]) { count += stats[k]; - return t('inspector.title_count', { title: t.html('feature.' + k + '.description'), count: stats[k] }); + return t.html('inspector.title_count', { title: { html: t.html('feature.' + k + '.description') }, count: stats[k] }); } return null; }).filter(Boolean); diff --git a/modules/ui/panels/measurement.js b/modules/ui/panels/measurement.js index 52f71e816..45ea2e606 100644 --- a/modules/ui/panels/measurement.js +++ b/modules/ui/panels/measurement.js @@ -132,7 +132,7 @@ export function uiPanelMeasurement(context) { .html(t.html('info_panels.measurement.geometry') + ':') .append('span') .html( - closed ? t('info_panels.measurement.closed_' + geometry) : t.html('geometry.' + geometry) + closed ? t.html('info_panels.measurement.closed_' + geometry) : t.html('geometry.' + geometry) ); } diff --git a/modules/ui/sections/changes.js b/modules/ui/sections/changes.js index 339ba1339..f9028fa42 100644 --- a/modules/ui/sections/changes.js +++ b/modules/ui/sections/changes.js @@ -29,7 +29,7 @@ export function uiSectionChanges(context) { .label(function() { var history = context.history(); var summary = history.difference().summary(); - return t.html('inspector.title_count', { title: t('commit.changes'), count: summary.length }); + return t.html('inspector.title_count', { title: { html: t.html('commit.changes') }, count: summary.length }); }) .disclosureContent(renderDisclosureContent); diff --git a/modules/ui/sections/entity_issues.js b/modules/ui/sections/entity_issues.js index 13f11d49f..32294dc46 100644 --- a/modules/ui/sections/entity_issues.js +++ b/modules/ui/sections/entity_issues.js @@ -24,7 +24,7 @@ export function uiSectionEntityIssues(context) { return _issues.length > 0; }) .label(function() { - return t.html('inspector.title_count', { title: t('issues.list_title'), count: _issues.length }); + return t.html('inspector.title_count', { title: { html: t.html('issues.list_title') }, count: _issues.length }); }) .disclosureContent(renderDisclosureContent); diff --git a/modules/ui/sections/raw_member_editor.js b/modules/ui/sections/raw_member_editor.js index 44c40a6c3..3f31a103e 100644 --- a/modules/ui/sections/raw_member_editor.js +++ b/modules/ui/sections/raw_member_editor.js @@ -33,7 +33,7 @@ export function uiSectionRawMemberEditor(context) { var gt = entity.members.length > _maxMembers ? '>' : ''; var count = gt + entity.members.slice(0, _maxMembers).length; - return t.html('inspector.title_count', { title: t('inspector.members'), count: count }); + return t.html('inspector.title_count', { title: { html: t.html('inspector.members') }, count: count }); }) .disclosureContent(renderDisclosureContent); diff --git a/modules/ui/sections/raw_membership_editor.js b/modules/ui/sections/raw_membership_editor.js index fec8414a1..5331d99fb 100644 --- a/modules/ui/sections/raw_membership_editor.js +++ b/modules/ui/sections/raw_membership_editor.js @@ -31,7 +31,7 @@ export function uiSectionRawMembershipEditor(context) { var parents = getSharedParentRelations(); var gt = parents.length > _maxMemberships ? '>' : ''; var count = gt + parents.slice(0, _maxMemberships).length; - return t('inspector.title_count', { title: t.html('inspector.relations'), count: count }); + return t.html('inspector.title_count', { title: { html: t.html('inspector.relations') }, count: count }); }) .disclosureContent(renderDisclosureContent); diff --git a/modules/ui/sections/raw_tag_editor.js b/modules/ui/sections/raw_tag_editor.js index 055b58672..376ef5221 100644 --- a/modules/ui/sections/raw_tag_editor.js +++ b/modules/ui/sections/raw_tag_editor.js @@ -17,7 +17,7 @@ export function uiSectionRawTagEditor(id, context) { .classes('raw-tag-editor') .label(function() { var count = Object.keys(_tags).filter(function(d) { return d; }).length; - return t('inspector.title_count', { title: t.html('inspector.tags'), count: count }); + return t.html('inspector.title_count', { title: { html: t.html('inspector.tags') }, count: count }); }) .expandedByDefault(false) .disclosureContent(renderDisclosureContent); diff --git a/modules/ui/sections/selection_list.js b/modules/ui/sections/selection_list.js index fcea89e68..ad6830863 100644 --- a/modules/ui/sections/selection_list.js +++ b/modules/ui/sections/selection_list.js @@ -17,7 +17,7 @@ export function uiSectionSelectionList(context) { return _selectedIDs.length > 1; }) .label(function() { - return t('inspector.title_count', { title: t.html('inspector.features'), count: _selectedIDs.length }); + return t.html('inspector.title_count', { title: { html: t.html('inspector.features') }, count: _selectedIDs.length }); }) .disclosureContent(renderDisclosureContent); diff --git a/modules/ui/sections/validation_issues.js b/modules/ui/sections/validation_issues.js index 6b0ceeeac..d385bd3d9 100644 --- a/modules/ui/sections/validation_issues.js +++ b/modules/ui/sections/validation_issues.js @@ -19,7 +19,7 @@ export function uiSectionValidationIssues(id, severity, context) { .label(function() { if (!_issues) return ''; var issueCountText = _issues.length > 1000 ? '1000+' : String(_issues.length); - return t('inspector.title_count', { title: t.html('issues.' + severity + 's.list_title'), count: issueCountText }); + return t.html('inspector.title_count', { title: { html: t.html('issues.' + severity + 's.list_title') }, count: issueCountText }); }) .disclosureContent(renderDisclosureContent) .shouldDisplay(function() { diff --git a/modules/ui/sections/validation_status.js b/modules/ui/sections/validation_status.js index 9c0f6b1ca..b4d18d38d 100644 --- a/modules/ui/sections/validation_status.js +++ b/modules/ui/sections/validation_status.js @@ -78,7 +78,7 @@ export function uiSectionValidationStatus(context) { .merge(resetIgnoredEnter); resetIgnored.select('a') - .html(t.html('inspector.title_count', { title: t('issues.reset_ignored'), count: ignoredIssues.length })); + .html(t.html('inspector.title_count', { title: { html: t.html('issues.reset_ignored') }, count: ignoredIssues.length })); resetIgnored.on('click', function(d3_event) { d3_event.preventDefault();