Merge branch 'js-i18n-p-r' into 'master'

i18n JS files starting with p or r

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

3 files changed, 10 insertions, 6 deletions

diff --git a/app/assets/javascripts/project_label_subscription.js b/app/assets/javascripts/project_label_subscription.js
index d3c604dcee1..5395e14cc79 100644
--- a/app/assets/javascripts/project_label_subscription.js
+++ b/app/assets/javascripts/project_label_subscription.js
@@ -38,9 +38,9 @@ export default class ProjectLabelSubscription {
         let newAction;
 
         if (oldStatus === 'unsubscribed') {
-          [newStatus, newAction] = ['subscribed', 'Unsubscribe'];
+          [newStatus, newAction] = ['subscribed', __('Unsubscribe')];
         } else {
-          [newStatus, newAction] = ['unsubscribed', 'Subscribe'];
+          [newStatus, newAction] = ['unsubscribed', __('Subscribe')];
         }
 
         $btn.removeClass('disabled');
diff --git a/app/assets/javascripts/project_select.js b/app/assets/javascripts/project_select.js
index 5ee510eb11d..dbe354a547b 100644
--- a/app/assets/javascripts/project_select.js
+++ b/app/assets/javascripts/project_select.js
@@ -3,6 +3,7 @@
 import $ from 'jquery';
 import Api from './api';
 import ProjectSelectComboButton from './project_select_combo_button';
+import { s__ } from './locale';
 
 export default function projectSelect() {
   import(/* webpackChunkName: 'select2' */ 'select2/select2')
@@ -21,9 +22,9 @@ export default function projectSelect() {
         this.includeProjectsInSubgroups = $(select).data('includeProjectsInSubgroups') || false;
         this.allowClear = $(select).data('allowClear') || false;
 
-        placeholder = 'Search for project';
+        placeholder = s__('ProjectSelect|Search for project');
         if (this.includeGroups) {
-          placeholder += ' or group';
+          placeholder += s__('ProjectSelect| or group');
         }
 
         $(select).select2({
diff --git a/app/assets/javascripts/right_sidebar.js b/app/assets/javascripts/right_sidebar.js
index 9a0cdc02952..72e061df573 100644
--- a/app/assets/javascripts/right_sidebar.js
+++ b/app/assets/javascripts/right_sidebar.js
@@ -5,7 +5,7 @@ import _ from 'underscore';
 import Cookies from 'js-cookie';
 import flash from './flash';
 import axios from './lib/utils/axios_utils';
-import { __ } from './locale';
+import { sprintf, s__, __ } from './locale';
 
 function Sidebar(currentUser) {
   this.toggleTodo = this.toggleTodo.bind(this);
@@ -101,7 +101,10 @@ Sidebar.prototype.toggleTodo = function(e) {
       this.todoUpdateDone(data);
     })
     .catch(() =>
-      flash(`There was an error ${ajaxType === 'post' ? 'adding a' : 'deleting the'} todo.`),
+      flash(sprintf(__('There was an error %{message} todo.')), {
+        message:
+          ajaxType === 'post' ? s__('RightSidebar|adding a') : s__('RightSidebar|deleting the'),
+      }),
     );
 };