diff options
author | Clement Ho <clemmakesapps@gmail.com> | 2019-05-07 17:44:47 +0000 |
---|---|---|
committer | Clement Ho <clemmakesapps@gmail.com> | 2019-05-07 17:44:47 +0000 |
commit | f6ca3b1ad980a82afa0e7c4caf075f4159a4352a (patch) | |
tree | e27f0a27efe4a10816a2444fa98389a0e5cbeb04 | |
parent | 426e8c68060e8744ca52543139084666127eb445 (diff) | |
parent | 028bb1171f1b13df7ee59e05574648e9df942697 (diff) | |
download | gitlab-ce-f6ca3b1ad980a82afa0e7c4caf075f4159a4352a.tar.gz |
Merge branch 'js-i18n-protected-branches' into 'master'
Internationalisation of protected_branches directory
See merge request gitlab-org/gitlab-ce!27737
4 files changed, 13 insertions, 3 deletions
diff --git a/app/assets/javascripts/protected_branches/protected_branch_access_dropdown.js b/app/assets/javascripts/protected_branches/protected_branch_access_dropdown.js index 40a873833e1..41e295387ae 100644 --- a/app/assets/javascripts/protected_branches/protected_branch_access_dropdown.js +++ b/app/assets/javascripts/protected_branches/protected_branch_access_dropdown.js @@ -1,3 +1,5 @@ +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(); diff --git a/app/assets/javascripts/protected_branches/protected_branch_create.js b/app/assets/javascripts/protected_branches/protected_branch_create.js index 48343c8ba0a..16ecd5523d6 100644 --- a/app/assets/javascripts/protected_branches/protected_branch_create.js +++ b/app/assets/javascripts/protected_branches/protected_branch_create.js @@ -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, diff --git a/app/assets/javascripts/protected_branches/protected_branch_edit.js b/app/assets/javascripts/protected_branches/protected_branch_edit.js index 5bc08f60d16..08d8c9919dd 100644 --- a/app/assets/javascripts/protected_branches/protected_branch_edit.js +++ b/app/assets/javascripts/protected_branches/protected_branch_edit.js @@ -1,6 +1,7 @@ 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'), ); diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 5aa048c28a3..4d253fa6043 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -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 "" |