diff options
author | Clement Ho <408677-ClemMakesApps@users.noreply.gitlab.com> | 2019-08-05 21:49:56 +0300 |
---|---|---|
committer | Clement Ho <408677-ClemMakesApps@users.noreply.gitlab.com> | 2019-08-05 21:49:56 +0300 |
commit | b683d6e65f7f6ab0e00492b09740ade33f58a491 (patch) | |
tree | be0b421c4acd43651a7569aa1b4df7f01ed43bcf /app | |
parent | cafeb1344712cb4630be5c75e30413a2944362fe (diff) | |
parent | b8834bbaf6207ac816152a264fb25332c1f773df (diff) |
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
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/notes/stores/utils.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/right_sidebar.js | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/app/assets/javascripts/notes/stores/utils.js b/app/assets/javascripts/notes/stores/utils.js index ed4cef4a917..97dcd54fe88 100644 --- a/app/assets/javascripts/notes/stores/utils.js +++ b/app/assets/javascripts/notes/stores/utils.js @@ -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 }); } } diff --git a/app/assets/javascripts/right_sidebar.js b/app/assets/javascripts/right_sidebar.js index 930c0d5e958..40a2158de78 100644 --- a/app/assets/javascripts/right_sidebar.js +++ b/app/assets/javascripts/right_sidebar.js @@ -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'), + }), + ), ); }; |