Commit f6ca3b1a authored by Clement Ho's avatar Clement Ho

Merge branch 'js-i18n-protected-branches' into 'master'

Internationalisation of protected_branches directory

See merge request gitlab-org/gitlab-ce!27737
parents 426e8c68 028bb117
import { __ } from '~/locale';
export default class ProtectedBranchAccessDropdown {
constructor(options) {
this.options = options;
......@@ -15,7 +17,7 @@ export default class ProtectedBranchAccessDropdown {
if ($el.is('.is-active')) {
return item.text;
}
return 'Select';
return __('Select');
},
clicked(options) {
options.e.preventDefault();
......
......@@ -2,6 +2,7 @@ import $ from 'jquery';
import ProtectedBranchAccessDropdown from './protected_branch_access_dropdown';
import CreateItemDropdown from '../create_item_dropdown';
import AccessorUtilities from '../lib/utils/accessor';
import { __ } from '~/locale';
export default class ProtectedBranchCreate {
constructor() {
......@@ -35,7 +36,7 @@ export default class ProtectedBranchCreate {
this.createItemDropdown = new CreateItemDropdown({
$dropdown: $protectedBranchDropdown,
defaultToggleLabel: 'Protected Branch',
defaultToggleLabel: __('Protected Branch'),
fieldName: 'protected_branch[name]',
onSelect: this.onSelectCallback,
getData: ProtectedBranchCreate.getProtectedBranches,
......
import flash from '../flash';
import axios from '../lib/utils/axios_utils';
import ProtectedBranchAccessDropdown from './protected_branch_access_dropdown';
import { __ } from '~/locale';
export default class ProtectedBranchEdit {
constructor(options) {
......@@ -68,7 +69,7 @@ export default class ProtectedBranchEdit {
this.$allowedToPushDropdown.enable();
flash(
'Failed to update branch!',
__('Failed to update branch!'),
'alert',
document.querySelector('.js-protected-branches-list'),
);
......
......@@ -4208,6 +4208,9 @@ msgstr ""
msgid "Failed to save preferences."
msgstr ""
msgid "Failed to update branch!"
msgstr ""
msgid "Failed to update issues, please try again."
msgstr ""
......@@ -7655,6 +7658,9 @@ msgstr ""
msgid "Protected"
msgstr ""
msgid "Protected Branch"
msgstr ""
msgid "Protected Tag"
msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment