kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Internationalisation of protected_branches directory

See merge request gitlab-org/gitlab-ce!27737
This commit is contained in:
Clement Ho 2019-05-07 17:44:47 +00:00
parent 426e8c6806 028bb1171f
commit f6ca3b1ad9
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/protected_branches/protected_branch_access_dropdown.js
View File

@ -1,3 +1,5 @@
import { __ } from '~/locale';
export default class ProtectedBranchAccessDropdown { export default class ProtectedBranchAccessDropdown {
constructor(options) { constructor(options) {
this.options = options; this.options = options;
@ -15,7 +17,7 @@ export default class ProtectedBranchAccessDropdown {
if ($el.is('.is-active')) { if ($el.is('.is-active')) {
return item.text; return item.text;
} }
return 'Select'; return __('Select');
}, },
clicked(options) { clicked(options) {
options.e.preventDefault(); options.e.preventDefault();

3
app/assets/javascripts/protected_branches/protected_branch_create.js
View File

@ -2,6 +2,7 @@ import $ from 'jquery';
import ProtectedBranchAccessDropdown from './protected_branch_access_dropdown'; import ProtectedBranchAccessDropdown from './protected_branch_access_dropdown';
import CreateItemDropdown from '../create_item_dropdown'; import CreateItemDropdown from '../create_item_dropdown';
import AccessorUtilities from '../lib/utils/accessor'; import AccessorUtilities from '../lib/utils/accessor';
import { __ } from '~/locale';
export default class ProtectedBranchCreate { export default class ProtectedBranchCreate {
constructor() { constructor() {
@ -35,7 +36,7 @@ export default class ProtectedBranchCreate {
this.createItemDropdown = new CreateItemDropdown({ this.createItemDropdown = new CreateItemDropdown({
$dropdown: $protectedBranchDropdown, $dropdown: $protectedBranchDropdown,
defaultToggleLabel: 'Protected Branch', defaultToggleLabel: __('Protected Branch'),
fieldName: 'protected_branch[name]', fieldName: 'protected_branch[name]',
onSelect: this.onSelectCallback, onSelect: this.onSelectCallback,
getData: ProtectedBranchCreate.getProtectedBranches, getData: ProtectedBranchCreate.getProtectedBranches,

3
app/assets/javascripts/protected_branches/protected_branch_edit.js
View File

@ -1,6 +1,7 @@
import flash from '../flash'; import flash from '../flash';
import axios from '../lib/utils/axios_utils'; import axios from '../lib/utils/axios_utils';
import ProtectedBranchAccessDropdown from './protected_branch_access_dropdown'; import ProtectedBranchAccessDropdown from './protected_branch_access_dropdown';
import { __ } from '~/locale';
export default class ProtectedBranchEdit { export default class ProtectedBranchEdit {
constructor(options) { constructor(options) {
@ -68,7 +69,7 @@ export default class ProtectedBranchEdit {
this.$allowedToPushDropdown.enable(); this.$allowedToPushDropdown.enable();
flash( flash(
'Failed to update branch!', __('Failed to update branch!'),
'alert', 'alert',
document.querySelector('.js-protected-branches-list'), document.querySelector('.js-protected-branches-list'),
); );

6
locale/gitlab.pot
View File

@ -4208,6 +4208,9 @@ msgstr ""
msgid "Failed to save preferences." msgid "Failed to save preferences."
msgstr "" msgstr ""
msgid "Failed to update branch!"
msgstr ""
msgid "Failed to update issues, please try again." msgid "Failed to update issues, please try again."
msgstr "" msgstr ""
@ -7655,6 +7658,9 @@ msgstr ""
msgid "Protected" msgid "Protected"
msgstr "" msgstr ""
msgid "Protected Branch"
msgstr ""
msgid "Protected Tag" msgid "Protected Tag"
msgstr "" msgstr ""