diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
commit | 311b0269b4eb9839fa63f80c8d7a58f32b8138a0 (patch) | |
tree | 07e7870bca8aed6d61fdcc810731c50d2c40af47 /app/assets/javascripts/profile | |
parent | 27909cef6c4170ed9205afa7426b8d3de47cbb0c (diff) |
Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42
Diffstat (limited to 'app/assets/javascripts/profile')
-rw-r--r-- | app/assets/javascripts/profile/account/components/delete_account_modal.vue | 4 | ||||
-rw-r--r-- | app/assets/javascripts/profile/account/components/update_username.vue | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/profile/account/components/delete_account_modal.vue b/app/assets/javascripts/profile/account/components/delete_account_modal.vue index 17cbcabeedb..3cb2dce87d3 100644 --- a/app/assets/javascripts/profile/account/components/delete_account_modal.vue +++ b/app/assets/javascripts/profile/account/components/delete_account_modal.vue @@ -37,7 +37,7 @@ export default { }, primaryProps() { return { - text: s__('Delete account'), + text: __('Delete account'), attributes: [ { variant: 'danger', 'data-qa-selector': 'confirm_delete_account_button' }, { category: 'primary' }, @@ -47,7 +47,7 @@ export default { }, cancelProps() { return { - text: s__('Cancel'), + text: __('Cancel'), }; }, canSubmit() { diff --git a/app/assets/javascripts/profile/account/components/update_username.vue b/app/assets/javascripts/profile/account/components/update_username.vue index 7917a9a75e0..45a6130826d 100644 --- a/app/assets/javascripts/profile/account/components/update_username.vue +++ b/app/assets/javascripts/profile/account/components/update_username.vue @@ -3,7 +3,7 @@ import { GlSafeHtmlDirective as SafeHtml, GlButton, GlModal, GlModalDirective } import { escape } from 'lodash'; import createFlash from '~/flash'; import axios from '~/lib/utils/axios_utils'; -import { s__, sprintf } from '~/locale'; +import { __, s__, sprintf } from '~/locale'; export default { components: { @@ -58,7 +58,7 @@ Please update your Git repository remotes as soon as possible.`), }, primaryProps() { return { - text: s__('Update username'), + text: __('Update username'), attributes: [ { variant: 'warning' }, { category: 'primary' }, @@ -68,7 +68,7 @@ Please update your Git repository remotes as soon as possible.`), }, cancelProps() { return { - text: s__('Cancel'), + text: __('Cancel'), }; }, }, |