diff options
| author | Kushal Pandya <kushalspandya@gmail.com> | 2019-05-24 08:32:46 +0000 |
|---|---|---|
| committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-05-24 08:32:46 +0000 |
| commit | bbe979f89c7f5f6c53b9c717b3459cff8aca27b5 (patch) | |
| tree | 0fa2f64ef2f85ec20129f3f2cc9b30e8c988471b | |
| parent | 79fc5e139c1dbfe0f80907bc319fea135f060279 (diff) | |
| parent | d61c72a08de74e95005fcf875e134b927c7a616b (diff) | |
| download | gitlab-ce-bbe979f89c7f5f6c53b9c717b3459cff8aca27b5.tar.gz | |
Merge branch 'js-18n-batch-comments' into 'master'
i18n of batch_comments directory
See merge request gitlab-org/gitlab-ce!28178
| -rw-r--r-- | app/assets/javascripts/batch_comments/mixins/resolved_status.js | 6 | ||||
| -rw-r--r-- | locale/gitlab.pot | 6 |
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 cc81e3b2e44..604b87b8438 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -5811,6 +5811,9 @@ msgstr "" msgid "Mark as resolved" msgstr "" +msgid "Mark comment as resolved" +msgstr "" + msgid "Mark this issue as a duplicate of another issue" msgstr "" @@ -8217,6 +8220,9 @@ msgstr "" msgid "Resolved all discussions." msgstr "" +msgid "Resolved by %{name}" +msgstr "" + msgid "Resolved by %{resolvedByName}" msgstr "" |