Merge branch 'develop' into accessible_ui

This commit is contained in:
Martin Raifer
2021-12-07 16:06:56 +01:00
140 changed files with 2047 additions and 878 deletions

View File

@@ -221,7 +221,7 @@ export function uiCommit(context) {
headerTitle
.append('div')
.append('h2')
.html(t.html('commit.title'));
.call(t.append('commit.title'));
headerTitle
.append('button')
@@ -280,7 +280,7 @@ export function uiCommit(context) {
prose = prose.enter()
.append('p')
.attr('class', 'commit-info')
.html(t.html('commit.upload_explanation'))
.call(t.append('commit.upload_explanation'))
.merge(prose);
// always check if this has changed, but only update prose.html()
@@ -303,12 +303,12 @@ export function uiCommit(context) {
userLink
.append('a')
.attr('class', 'user-info')
.html(user.display_name)
.text(user.display_name)
.attr('href', osm.userURL(user.display_name))
.attr('target', '_blank');
prose
.html(t.html('commit.upload_explanation_with_user', { user: userLink.html() }));
.html(t.html('commit.upload_explanation_with_user', { user: { html: userLink.html() } }));
});
@@ -339,7 +339,7 @@ export function uiCommit(context) {
labelEnter
.append('span')
.html(t.html('commit.request_review'));
.call(t.append('commit.request_review'));
// Update
requestReview = requestReview
@@ -364,7 +364,7 @@ export function uiCommit(context) {
.attr('class', 'secondary-action button cancel-button')
.append('span')
.attr('class', 'label')
.html(t.html('commit.cancel'));
.call(t.append('commit.cancel'));
var uploadButton = buttonEnter
.append('button')
@@ -372,7 +372,7 @@ export function uiCommit(context) {
uploadButton.append('span')
.attr('class', 'label')
.html(t.html('commit.save'));
.call(t.append('commit.save'));
var uploadBlockerTooltipText = getUploadBlockerMessage();