diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-20 13:43:29 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-20 13:43:29 +0300 |
commit | 3b1af5cc7ed2666ff18b718ce5d30fa5a2756674 (patch) | |
tree | 3bc4a40e0ee51ec27eabf917c537033c0c5b14d4 /app/assets/javascripts/jira_connect/subscriptions/pages/sign_in | |
parent | 9bba14be3f2c211bf79e15769cd9b77bc73a13bc (diff) |
Add latest changes from gitlab-org/gitlab@16-1-stable-eev16.1.0-rc42
Diffstat (limited to 'app/assets/javascripts/jira_connect/subscriptions/pages/sign_in')
6 files changed, 18 insertions, 15 deletions
diff --git a/app/assets/javascripts/jira_connect/subscriptions/pages/sign_in/sign_in_gitlab_com.vue b/app/assets/javascripts/jira_connect/subscriptions/pages/sign_in/sign_in_gitlab_com.vue index 113ce34fdcd..78bdb5caa77 100644 --- a/app/assets/javascripts/jira_connect/subscriptions/pages/sign_in/sign_in_gitlab_com.vue +++ b/app/assets/javascripts/jira_connect/subscriptions/pages/sign_in/sign_in_gitlab_com.vue @@ -17,8 +17,8 @@ export default { }, }, i18n: { - signInButtonTextWithSubscriptions: s__('Integrations|Sign in to add namespaces'), - signInText: s__('JiraService|Sign in to GitLab to get started.'), + signInButtonTextWithSubscriptions: s__('JiraConnect|Sign in to link groups'), + signInText: s__('JiraConnect|Sign in to GitLab to get started.'), }, GITLAB_COM_BASE_PATH, methods: { @@ -31,7 +31,7 @@ export default { <template> <div> - <h2 class="gl-text-center gl-mb-7">{{ s__('JiraService|GitLab for Jira Configuration') }}</h2> + <h2 class="gl-text-center gl-mb-7">{{ s__('JiraConnect|GitLab for Jira Configuration') }}</h2> <div v-if="hasSubscriptions"> <div class="gl-display-flex gl-justify-content-end gl-mb-3"> <sign-in-oauth-button diff --git a/app/assets/javascripts/jira_connect/subscriptions/pages/sign_in/sign_in_gitlab_multiversion/index.vue b/app/assets/javascripts/jira_connect/subscriptions/pages/sign_in/sign_in_gitlab_multiversion/index.vue index 8cc107930d1..e05eb900efa 100644 --- a/app/assets/javascripts/jira_connect/subscriptions/pages/sign_in/sign_in_gitlab_multiversion/index.vue +++ b/app/assets/javascripts/jira_connect/subscriptions/pages/sign_in/sign_in_gitlab_multiversion/index.vue @@ -8,6 +8,7 @@ import { updateInstallation, setApiBaseURL } from '~/jira_connect/subscriptions/ import { GITLAB_COM_BASE_PATH, I18N_UPDATE_INSTALLATION_ERROR_MESSAGE, + FAILED_TO_UPDATE_DOC_LINK, } from '~/jira_connect/subscriptions/constants'; import { SET_ALERT } from '~/jira_connect/subscriptions/store/mutation_types'; @@ -56,6 +57,7 @@ export default { .catch(() => { this.setAlert({ message: I18N_UPDATE_INSTALLATION_ERROR_MESSAGE, + linkUrl: FAILED_TO_UPDATE_DOC_LINK, variant: 'danger', }); this.loadingVersionSelect = false; @@ -66,9 +68,9 @@ export default { }, }, i18n: { - title: s__('JiraService|Welcome to GitLab for Jira'), - signInSubtitle: s__('JiraService|Sign in to GitLab to link namespaces.'), - changeVersionButtonText: s__('JiraService|Change GitLab version'), + title: s__('JiraConnect|Welcome to GitLab for Jira'), + signInSubtitle: s__('JiraConnect|Sign in to GitLab to link groups.'), + changeVersionButtonText: s__('JiraConnect|Change GitLab version'), }, }; </script> diff --git a/app/assets/javascripts/jira_connect/subscriptions/pages/sign_in/sign_in_gitlab_multiversion/self_managed_alert.vue b/app/assets/javascripts/jira_connect/subscriptions/pages/sign_in/sign_in_gitlab_multiversion/self_managed_alert.vue index 8ddbbffa708..cd71ded87b5 100644 --- a/app/assets/javascripts/jira_connect/subscriptions/pages/sign_in/sign_in_gitlab_multiversion/self_managed_alert.vue +++ b/app/assets/javascripts/jira_connect/subscriptions/pages/sign_in/sign_in_gitlab_multiversion/self_managed_alert.vue @@ -7,9 +7,9 @@ export default { GlAlert, }, i18n: { - title: s__('JiraService|Are you a GitLab administrator?'), + title: s__('JiraConnect|Are you a GitLab administrator?'), body: s__( - "JiraService|Setting up this integration is only possible if you're a GitLab administrator.", + "JiraConnect|Setting up this integration is only possible if you're a GitLab administrator.", ), }, }; diff --git a/app/assets/javascripts/jira_connect/subscriptions/pages/sign_in/sign_in_gitlab_multiversion/setup_instructions.vue b/app/assets/javascripts/jira_connect/subscriptions/pages/sign_in/sign_in_gitlab_multiversion/setup_instructions.vue index 621bcccd19a..d8d2db18d9f 100644 --- a/app/assets/javascripts/jira_connect/subscriptions/pages/sign_in/sign_in_gitlab_multiversion/setup_instructions.vue +++ b/app/assets/javascripts/jira_connect/subscriptions/pages/sign_in/sign_in_gitlab_multiversion/setup_instructions.vue @@ -13,11 +13,11 @@ export default { <template> <div class="gl-mt-5"> - <h3>{{ s__('JiraService|Continue setup in GitLab') }}</h3> + <h3>{{ s__('JiraConnect|Continue setup in GitLab') }}</h3> <p> {{ s__( - 'JiraService|In order to complete the set up, you’ll need to complete a few steps in GitLab.', + 'JiraConnect|In order to complete the set up, you’ll need to complete a few steps in GitLab.', ) }} <gl-link diff --git a/app/assets/javascripts/jira_connect/subscriptions/pages/sign_in/sign_in_gitlab_multiversion/version_select_form.vue b/app/assets/javascripts/jira_connect/subscriptions/pages/sign_in/sign_in_gitlab_multiversion/version_select_form.vue index 3a080afd3c5..d3770cc310a 100644 --- a/app/assets/javascripts/jira_connect/subscriptions/pages/sign_in/sign_in_gitlab_multiversion/version_select_form.vue +++ b/app/assets/javascripts/jira_connect/subscriptions/pages/sign_in/sign_in_gitlab_multiversion/version_select_form.vue @@ -56,7 +56,7 @@ export default { ? this.$options.i18n.buttonNext : this.$options.i18n.buttonSave; }, - showVersonSelect() { + showVersionSelect() { return !this.showSetupInstructions && !this.showSelfManagedInstanceInput; }, }, @@ -85,21 +85,21 @@ export default { }, radioOptions: RADIO_OPTIONS, i18n: { - title: s__('JiraService|What version of GitLab are you using?'), + title: s__('JiraConnect|What version of GitLab are you using?'), saasRadioLabel: __('GitLab.com (SaaS)'), saasRadioHelp: __('Most common'), selfManagedRadioLabel: __('GitLab (self-managed)'), buttonNext: __('Next'), buttonSave: __('Save'), - instanceURLInputLabel: s__('JiraService|GitLab instance URL'), - instanceURLInputDescription: s__('JiraService|For example: https://gitlab.example.com'), + instanceURLInputLabel: s__('JiraConnect|GitLab instance URL'), + instanceURLInputDescription: s__('JiraConnect|For example: https://gitlab.example.com'), }, }; </script> <template> <gl-form class="gl-max-w-62 gl-mx-auto" @submit.prevent="onSubmit"> - <div v-if="showVersonSelect"> + <div v-if="showVersionSelect"> <h5 class="gl-mb-5">{{ $options.i18n.title }}</h5> <gl-form-radio-group v-model="selected" class="gl-mb-3" name="gitlab_version"> <gl-form-radio :value="$options.radioOptions.saas"> diff --git a/app/assets/javascripts/jira_connect/subscriptions/pages/sign_in/sign_in_page.vue b/app/assets/javascripts/jira_connect/subscriptions/pages/sign_in/sign_in_page.vue index ee20e21011f..87d7f73be2a 100644 --- a/app/assets/javascripts/jira_connect/subscriptions/pages/sign_in/sign_in_page.vue +++ b/app/assets/javascripts/jira_connect/subscriptions/pages/sign_in/sign_in_page.vue @@ -22,6 +22,7 @@ export default { }, }; </script> + <template> <sign-in-gitlab-multiversion v-if="isOauthSelfManagedEnabled" |