Merge branch 'js-i18n-diff-notes' into 'master'

Internationalisation of diff_note directory

See merge request gitlab-org/gitlab-ce!27677

app/assets/javascripts/diff_notes/components/comment_resolve_btn.js

@@ -3,6 +3,7 @@
 
 import $ from 'jquery';
 import Vue from 'vue';
+import { __ } from '~/locale';
 
 const CommentAndResolveBtn = Vue.extend({
   props: {
@@ -31,15 +32,15 @@ const CommentAndResolveBtn = Vue.extend({
     buttonText: function() {
       if (this.isDiscussionResolved) {
         if (this.textareaIsEmpty) {
-          return 'Unresolve discussion';
+          return __('Unresolve discussion');
         } else {
-          return 'Comment & unresolve discussion';
+          return __('Comment & unresolve discussion');
         }
       } else {
         if (this.textareaIsEmpty) {
-          return 'Resolve discussion';
+          return __('Resolve discussion');
         } else {
-          return 'Comment & resolve discussion';
+          return __('Comment & resolve discussion');
         }
       }
     },

app/assets/javascripts/diff_notes/components/diff_note_avatars.js

@@ -5,6 +5,7 @@ import Vue from 'vue';
 import collapseIcon from '../icons/collapse_icon.svg';
 import Notes from '../../notes';
 import userAvatarImage from '../../vue_shared/components/user_avatar/user_avatar_image.vue';
+import { n__ } from '~/locale';
 
 const DiffNoteAvatars = Vue.extend({
   components: {
@@ -44,7 +45,7 @@ const DiffNoteAvatars = Vue.extend({
       if (this.discussion) {
         const extra = this.discussion.notesCount() - this.shownAvatars;
 
-        return `${extra} more comment${extra > 1 ? 's' : ''}`;
+        return n__('%d more comment', '%d more comments', extra);
       }
 
       return '';

app/assets/javascripts/diff_notes/components/jump_to_discussion.js

@@ -3,6 +3,7 @@
 
 import $ from 'jquery';
 import Vue from 'vue';
+import { __ } from '~/locale';
 
 import DiscussionMixins from '../mixins/discussion';
 
@@ -23,9 +24,9 @@ const JumpToDiscussion = Vue.extend({
   computed: {
     buttonText: function() {
       if (this.discussionId) {
-        return 'Jump to next unresolved discussion';
+        return __('Jump to next unresolved discussion');
       } else {
-        return 'Jump to first unresolved discussion';
+        return __('Jump to first unresolved discussion');
       }
     },
     allResolved: function() {

app/assets/javascripts/diff_notes/components/resolve_btn.js

@@ -4,6 +4,7 @@
 import $ from 'jquery';
 import Vue from 'vue';
 import Flash from '../../flash';
+import { sprintf, __ } from '~/locale';
 
 const ResolveBtn = Vue.extend({
   props: {
@@ -55,12 +56,14 @@ const ResolveBtn = Vue.extend({
     },
     buttonText() {
       if (this.isResolved) {
-        return `Resolved by ${this.resolvedByName}`;
+        return sprintf(__('Resolved by %{resolvedByName}'), {
+          resolvedByName: this.resolvedByName,
+        });
       } else if (this.canResolve) {
-        return 'Mark as resolved';
+        return __('Mark as resolved');
       }
 
-      return 'Unable to resolve';
+      return __('Unable to resolve');
     },
     isResolved() {
       if (this.note) {
@@ -132,7 +135,8 @@ const ResolveBtn = Vue.extend({
           this.updateTooltip();
         })
         .catch(
-          () => new Flash('An error occurred when trying to resolve a comment. Please try again.'),
+          () =>
+            new Flash(__('An error occurred when trying to resolve a comment. Please try again.')),
         );
     },
   },

app/assets/javascripts/diff_notes/components/resolve_discussion_btn.js

@@ -3,6 +3,7 @@
 /* global ResolveService */
 
 import Vue from 'vue';
+import { __ } from '~/locale';
 
 const ResolveDiscussionBtn = Vue.extend({
   props: {
@@ -41,9 +42,9 @@ const ResolveDiscussionBtn = Vue.extend({
     },
     buttonText: function() {
       if (this.isDiscussionResolved) {
-        return 'Unresolve discussion';
+        return __('Unresolve discussion');
       } else {
-        return 'Resolve discussion';
+        return __('Resolve discussion');
       }
     },
     loading: function() {

app/assets/javascripts/diff_notes/services/resolve.js

@@ -3,6 +3,7 @@
 import Vue from 'vue';
 import Flash from '../../flash';
 import '../../vue_shared/vue_resource_interceptor';
+import { __ } from '~/locale';
 
 window.gl = window.gl || {};
 
@@ -49,7 +50,8 @@ class ResolveServiceClass {
         discussion.updateHeadline(data);
       })
       .catch(
-        () => new Flash('An error occurred when trying to resolve a discussion. Please try again.'),
+        () =>
+          new Flash(__('An error occurred when trying to resolve a discussion. Please try again.')),
       );
   }
 

locale/gitlab.pot

@@ -84,6 +84,11 @@ msgid_plural "%d metrics"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "%d more comment"
+msgid_plural "%d more comments"
+msgstr[0] ""
+msgstr[1] ""
+
 msgid "%d staged change"
 msgid_plural "%d staged changes"
 msgstr[0] ""
@@ -818,6 +823,12 @@ msgstr ""
 msgid "An error occurred when toggling the notification subscription"
 msgstr ""
 
+msgid "An error occurred when trying to resolve a comment. Please try again."
+msgstr ""
+
+msgid "An error occurred when trying to resolve a discussion. Please try again."
+msgstr ""
+
 msgid "An error occurred while detecting host keys"
 msgstr ""
 
@@ -5251,6 +5262,12 @@ msgstr ""
 msgid "July"
 msgstr ""
 
+msgid "Jump to first unresolved discussion"
+msgstr ""
+
+msgid "Jump to next unresolved discussion"
+msgstr ""
+
 msgid "Jun"
 msgstr ""
 
@@ -5594,6 +5611,9 @@ msgstr ""
 msgid "March"
 msgstr ""
 
+msgid "Mark as resolved"
+msgstr ""
+
 msgid "Mark this issue as a duplicate of another issue"
 msgstr ""
 
@@ -7904,6 +7924,9 @@ msgstr ""
 msgid "Resolved all discussions."
 msgstr ""
 
+msgid "Resolved by %{resolvedByName}"
+msgstr ""
+
 msgid "Response metrics (AWS ELB)"
 msgstr ""
 
@@ -10068,6 +10091,9 @@ msgstr ""
 msgid "Unable to regenerate public ssh key."
 msgstr ""
 
+msgid "Unable to resolve"
+msgstr ""
+
 msgid "Unable to schedule a pipeline to run immediately"
 msgstr ""