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

Merge branch 'js-18n-batch-comments' into 'master'

Browse source 
i18n of batch_comments directory

See merge request gitlab-org/gitlab-ce!28178
This commit is contained in:
Kushal Pandya 2019-05-24 08:32:46 +00:00
commit bbe979f89c
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/batch_comments/mixins/resolved_status.js
View file

@ -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;

6
locale/gitlab.pot
View file

@ -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 ""