summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrandon Labuschagne <blabuschagne@gitlab.com>2019-05-07 14:11:36 +0200
committerBrandon Labuschagne <blabuschagne@gitlab.com>2019-05-21 11:36:36 +0200
commitd61c72a08de74e95005fcf875e134b927c7a616b (patch)
treeb4fdc9ed497f6cccf7c49433e00ed01befbfb7d4
parent5ae293e33c4d6c8187543778717474a7aaccee1c (diff)
downloadgitlab-ce-js-18n-batch-comments.tar.gz
I18N of batch_comments directoryjs-18n-batch-comments
This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. This commit only targets Vanilla JS files. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
-rw-r--r--app/assets/javascripts/batch_comments/mixins/resolved_status.js6
-rw-r--r--locale/gitlab.pot6
2 files changed, 10 insertions, 2 deletions
diff --git a/app/assets/javascripts/batch_comments/mixins/resolved_status.js b/app/assets/javascripts/batch_comments/mixins/resolved_status.js
index 96ee9f62ba4..3bbbaa86b51 100644
--- a/app/assets/javascripts/batch_comments/mixins/resolved_status.js
+++ b/app/assets/javascripts/batch_comments/mixins/resolved_status.js
@@ -1,10 +1,12 @@
+import { sprintf, __ } from '~/locale';
+
export default {
computed: {
resolveButtonTitle() {
- let title = 'Mark comment as resolved';
+ let title = __('Mark comment as resolved');
if (this.resolvedBy) {
- title = `Resolved by ${this.resolvedBy.name}`;
+ title = sprintf(__('Resolved by %{name}'), { name: this.resolvedBy.name });
}
return title;
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index a4fb9ec927a..081e7c255d9 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -5773,6 +5773,9 @@ msgstr ""
msgid "Mark as resolved"
msgstr ""
+msgid "Mark comment as resolved"
+msgstr ""
+
msgid "Mark this issue as a duplicate of another issue"
msgstr ""
@@ -8167,6 +8170,9 @@ msgstr ""
msgid "Resolved all discussions."
msgstr ""
+msgid "Resolved by %{name}"
+msgstr ""
+
msgid "Resolved by %{resolvedByName}"
msgstr ""