kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '63474-applying-a-quick-action-does-not-show-the-correct-message' into 'master' 

Fixed bug from extra parenthesis

Closes #63474

See merge request gitlab-org/gitlab-ce!31479
This commit is contained in:
Clement Ho 2019-08-05 18:49:56 +00:00
parent cafeb13447 b8834bbaf6
commit b683d6e65f
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/notes/stores/utils.js
View File

@ -21,7 +21,7 @@ export const getQuickActionText = note => {
text = __('Applying multiple commands');
} else {
const commandDescription = executedCommands[0].description.toLowerCase();
text = sprintf(__('Applying command to %{commandDescription}', { commandDescription }));
text = sprintf(__('Applying command to %{commandDescription}'), { commandDescription });
}
}

10
app/assets/javascripts/right_sidebar.js
View File

@ -101,10 +101,12 @@ Sidebar.prototype.toggleTodo = function(e) {
this.todoUpdateDone(data);
})
.catch(() =>
flash(sprintf(__('There was an error %{message} todo.')), {
message:
ajaxType === 'post' ? s__('RightSidebar|adding a') : s__('RightSidebar|deleting the'),
}),
flash(
sprintf(__('There was an error %{message} todo.'), {
message:
ajaxType === 'post' ? s__('RightSidebar|adding a') : s__('RightSidebar|deleting the'),
}),
),
);
};