Automatic merge of gitlab-org/gitlab-ce master

app/assets/javascripts/create_merge_request_dropdown.js

@@ -118,7 +118,7 @@ export default class CreateMergeRequestDropdown {
         this.branchCreated = true;
         window.location.href = data.url;
       })
-      .catch(() => Flash('Failed to create a branch for this issue. Please try again.'));
+      .catch(() => Flash(__('Failed to create a branch for this issue. Please try again.')));
   }
 
   createMergeRequest() {
@@ -130,7 +130,7 @@ export default class CreateMergeRequestDropdown {
         this.mergeRequestCreated = true;
         window.location.href = data.url;
       })
-      .catch(() => Flash('Failed to create Merge Request. Please try again.'));
+      .catch(() => Flash(__('Failed to create Merge Request. Please try again.')));
   }
 
   disable() {
@@ -227,7 +227,7 @@ export default class CreateMergeRequestDropdown {
       .catch(() => {
         this.unavailable();
         this.disable();
-        new Flash('Failed to get ref.');
+        new Flash(__('Failed to get ref.'));
 
         this.isGettingRef = false;
 

app/assets/javascripts/dropzone_input.js

@@ -4,6 +4,7 @@ import _ from 'underscore';
 import './behaviors/preview_markdown';
 import csrf from './lib/utils/csrf';
 import axios from './lib/utils/axios_utils';
+import { n__, __ } from '~/locale';
 
 Dropzone.autoDiscover = false;
 
@@ -90,7 +91,7 @@ export default function dropzoneInput(form) {
       if (!processingFileCount) $attachButton.removeClass('hide');
       addFileToForm(response.link.url);
     },
-    error: (file, errorMessage = 'Attaching the file failed.', xhr) => {
+    error: (file, errorMessage = __('Attaching the file failed.'), xhr) => {
       // If 'error' event is fired by dropzone, the second parameter is error message.
       // If the 'errorMessage' parameter is empty, the default error message is set.
       // If the 'error' event is fired by backend (xhr) error response, the third parameter is
@@ -273,19 +274,11 @@ export default function dropzoneInput(form) {
   };
 
   updateAttachingMessage = (files, messageContainer) => {
-    let attachingMessage;
     const filesCount = files.filter(file => file.status === 'uploading' || file.status === 'queued')
       .length;
+    const attachingMessage = n__('Attaching a file', 'Attaching %d files', filesCount);
 
-    // Dinamycally change uploading files text depending on files number in
-    // dropzone files queue.
-    if (filesCount > 1) {
-      attachingMessage = `Attaching ${filesCount} files -`;
-    } else {
-      attachingMessage = 'Attaching a file -';
-    }
-
-    messageContainer.text(attachingMessage);
+    messageContainer.text(`${attachingMessage} -`);
   };
 
   form.find('.markdown-selector').click(function onMarkdownClick(e) {

app/assets/javascripts/import_projects/store/getters.js

+import { __ } from '~/locale';
+
 export const namespaceSelectOptions = state => {
   const serializedNamespaces = state.namespaces.map(({ fullPath }) => ({
     id: fullPath,
@@ -5,9 +7,9 @@ export const namespaceSelectOptions = state => {
   }));
 
   return [
-    { text: 'Groups', children: serializedNamespaces },
+    { text: __('Groups'), children: serializedNamespaces },
     {
-      text: 'Users',
+      text: __('Users'),
       children: [{ id: state.defaultTargetNamespace, text: state.defaultTargetNamespace }],
     },
   ];

locale/gitlab.pot

@@ -5102,6 +5102,12 @@ msgstr ""
 msgid "Failed to connect to the prometheus server"
 msgstr ""
 
+msgid "Failed to create Merge Request. Please try again."
+msgstr ""
+
+msgid "Failed to create a branch for this issue. Please try again."
+msgstr ""
+
 msgid "Failed to create repository via gitlab-shell"
 msgstr ""
 
@@ -5111,6 +5117,9 @@ msgstr ""
 msgid "Failed to deploy to"
 msgstr ""
 
+msgid "Failed to get ref."
+msgstr ""
+
 msgid "Failed to install."
 msgstr ""