From 29a47bfc27597c8fb5aa2cdeedd026a8af85f083 Mon Sep 17 00:00:00 2001 From: Brandon Labuschagne Date: Tue, 7 May 2019 08:40:58 +0200 Subject: I18N JS files starting with s This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. This commit only targets Vanilla JS files. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html --- app/assets/javascripts/search_autocomplete.js | 4 ++-- app/assets/javascripts/star.js | 2 +- app/assets/javascripts/subscription_select.js | 3 ++- locale/gitlab.pot | 6 ++++++ 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/search_autocomplete.js b/app/assets/javascripts/search_autocomplete.js index 0a4583b5861..e5c3cebfb9a 100644 --- a/app/assets/javascripts/search_autocomplete.js +++ b/app/assets/javascripts/search_autocomplete.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import { escape, throttle } from 'underscore'; -import { s__, sprintf } from '~/locale'; +import { s__, __, sprintf } from '~/locale'; import { getIdenticonBackgroundClass, getIdenticonTitle } from '~/helpers/avatar_helper'; import axios from './lib/utils/axios_utils'; import DropdownUtils from './filtered_search/dropdown_utils'; @@ -439,7 +439,7 @@ export class SearchAutocomplete { restoreMenu() { var html; - html = ''; + html = ``; return this.dropdownContent.html(html); } diff --git a/app/assets/javascripts/star.js b/app/assets/javascripts/star.js index 7404dfbf22a..70f89152f70 100644 --- a/app/assets/javascripts/star.js +++ b/app/assets/javascripts/star.js @@ -31,7 +31,7 @@ export default class Star { $this.prepend(spriteIcon('star', iconClasses)); } }) - .catch(() => Flash('Star toggle failed. Try again later.')); + .catch(() => Flash(__('Star toggle failed. Try again later.'))); }); } } diff --git a/app/assets/javascripts/subscription_select.js b/app/assets/javascripts/subscription_select.js index ebe1c6dd02d..7206bbd7109 100644 --- a/app/assets/javascripts/subscription_select.js +++ b/app/assets/javascripts/subscription_select.js @@ -1,4 +1,5 @@ import $ from 'jquery'; +import { __ } from './locale'; export default function subscriptionSelect() { $('.js-subscription-event').each((i, element) => { @@ -8,7 +9,7 @@ export default function subscriptionSelect() { selectable: true, fieldName, toggleLabel(selected, el, instance) { - let label = 'Subscription'; + let label = __('Subscription'); const $item = instance.dropdown.find('.is-active'); if ($item.length) { label = $item.text(); diff --git a/locale/gitlab.pot b/locale/gitlab.pot index c20cae9665a..f5f0e69d574 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -9056,6 +9056,9 @@ msgstr "" msgid "Star a label to make it a priority label. Order the prioritized labels to change their relative priority, by dragging." msgstr "" +msgid "Star toggle failed. Try again later." +msgstr "" + msgid "StarProject|Star" msgstr "" @@ -9188,6 +9191,9 @@ msgstr "" msgid "Subscribed" msgstr "" +msgid "Subscription" +msgstr "" + msgid "Subtracts" msgstr "" -- cgit v1.2.1