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

Internationalisation of notes directory

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

app/assets/javascripts/notes/mixins/autosave.js

 import $ from 'jquery';
 import Autosave from '../../autosave';
 import { capitalizeFirstCharacter } from '../../lib/utils/text_utility';
+import { s__ } from '~/locale';
 
 export default {
   methods: {
     initAutoSave(noteable, extraKeys = []) {
       let keys = [
-        'Note',
+        s__('Autosave|Note'),
         capitalizeFirstCharacter(noteable.noteable_type || noteable.noteableType),
         noteable.id,
       ];

app/assets/javascripts/notes/stores/actions.js

@@ -255,7 +255,7 @@ export const saveNote = ({ commit, dispatch }, noteData) => {
       eTagPoll.makeRequest();
 
       $('.js-gfm-input').trigger('clear-commands-cache.atwho');
-      Flash('Commands applied', 'notice', noteData.flashContainer);
+      Flash(__('Commands applied'), 'notice', noteData.flashContainer);
     }
 
     if (commandsChanges) {
@@ -269,7 +269,7 @@ export const saveNote = ({ commit, dispatch }, noteData) => {
           })
           .catch(() => {
             Flash(
-              'Something went wrong while adding your award. Please try again.',
+              __('Something went wrong while adding your award. Please try again.'),
               'alert',
               noteData.flashContainer,
             );
@@ -311,7 +311,7 @@ export const poll = ({ commit, state, getters, dispatch }) => {
     data: state,
     successCallback: resp =>
       resp.json().then(data => pollSuccessCallBack(data, commit, state, getters, dispatch)),
-    errorCallback: () => Flash('Something went wrong while fetching latest comments.'),
+    errorCallback: () => Flash(__('Something went wrong while fetching latest comments.')),
   });
 
   if (!Visibility.hidden()) {
@@ -347,7 +347,7 @@ export const fetchData = ({ commit, state, getters }) => {
     .poll(requestData)
     .then(resp => resp.json)
     .then(data => pollSuccessCallBack(data, commit, state, getters))
-    .catch(() => Flash('Something went wrong while fetching latest comments.'));
+    .catch(() => Flash(__('Something went wrong while fetching latest comments.')));
 };
 
 export const toggleAward = ({ commit, getters }, { awardName, noteId }) => {

app/assets/javascripts/notes/stores/utils.js

 import AjaxCache from '~/lib/utils/ajax_cache';
 import { trimFirstCharOfLineContent } from '~/diffs/store/utils';
+import { sprintf, __ } from '~/locale';
 
 const REGEX_QUICK_ACTIONS = /^\/\w+.*$/gm;
 
 export const findNoteObjectById = (notes, id) => notes.filter(n => n.id === id)[0];
 
 export const getQuickActionText = note => {
-  let text = 'Applying command';
+  let text = __('Applying command');
   const quickActions = AjaxCache.get(gl.GfmAutoComplete.dataSources.commands) || [];
 
   const executedCommands = quickActions.filter(command => {
@@ -16,10 +17,10 @@ export const getQuickActionText = note => {
 
   if (executedCommands && executedCommands.length) {
     if (executedCommands.length > 1) {
-      text = 'Applying multiple commands';
+      text = __('Applying multiple commands');
     } else {
       const commandDescription = executedCommands[0].description.toLowerCase();
-      text = `Applying command to ${commandDescription}`;
+      text = sprintf(__('Applying command to %{commandDescription}', { commandDescription }));
     }
   }
 

locale/gitlab.pot

@@ -972,6 +972,15 @@ msgstr ""
 msgid "Apply suggestion"
 msgstr ""
 
+msgid "Applying command"
+msgstr ""
+
+msgid "Applying command to %{commandDescription}"
+msgstr ""
+
+msgid "Applying multiple commands"
+msgstr ""
+
 msgid "Apr"
 msgstr ""
 
@@ -1197,6 +1206,9 @@ msgstr ""
 msgid "Automatically resolved"
 msgstr ""
 
+msgid "Autosave|Note"
+msgstr ""
+
 msgid "Available"
 msgstr ""
 
@@ -2430,6 +2442,9 @@ msgstr ""
 msgid "Command line instructions"
 msgstr ""
 
+msgid "Commands applied"
+msgstr ""
+
 msgid "Comment"
 msgstr ""
 
@@ -8473,6 +8488,9 @@ msgstr ""
 msgid "Something went wrong when toggling the button"
 msgstr ""
 
+msgid "Something went wrong while adding your award. Please try again."
+msgstr ""
+
 msgid "Something went wrong while applying the suggestion. Please try again."
 msgstr ""
 
@@ -8485,6 +8503,9 @@ msgstr ""
 msgid "Something went wrong while fetching comments. Please try again."
 msgstr ""
 
+msgid "Something went wrong while fetching latest comments."
+msgstr ""
+
 msgid "Something went wrong while fetching related merge requests."
 msgstr ""