diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 22:00:14 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 22:00:14 +0300 |
commit | 05f0ebba3a2c8ddf39e436f412dc2ab5bf1353b2 (patch) | |
tree | 11d0f2a6ec31c7793c184106cedc2ded3d9a2cc5 /app/assets/javascripts/pages/projects/learn_gitlab/components/learn_gitlab_section_link.vue | |
parent | ec73467c23693d0db63a797d10194da9e72a74af (diff) |
Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42
Diffstat (limited to 'app/assets/javascripts/pages/projects/learn_gitlab/components/learn_gitlab_section_link.vue')
-rw-r--r-- | app/assets/javascripts/pages/projects/learn_gitlab/components/learn_gitlab_section_link.vue | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/app/assets/javascripts/pages/projects/learn_gitlab/components/learn_gitlab_section_link.vue b/app/assets/javascripts/pages/projects/learn_gitlab/components/learn_gitlab_section_link.vue index 3717d8027c4..d9b0dbbb9b0 100644 --- a/app/assets/javascripts/pages/projects/learn_gitlab/components/learn_gitlab_section_link.vue +++ b/app/assets/javascripts/pages/projects/learn_gitlab/components/learn_gitlab_section_link.vue @@ -22,7 +22,7 @@ export default { GlTooltip, }, i18n: { - contactAdmin: s__('LearnGitlab|Contact your administrator to start a free Ultimate trial.'), + contactAdmin: s__('LearnGitlab|Contact your administrator to enable this action.'), viewAdminList: s__('LearnGitlab|View administrator list'), watchHow: __('Watch how'), }, @@ -50,6 +50,9 @@ export default { openInNewTab() { return ACTION_LABELS[this.action]?.openInNewTab === true || this.value.openInNewTab === true; }, + popoverText() { + return this.value.message || this.$options.i18n.contactAdmin; + }, }, methods: { openModal() { @@ -101,7 +104,7 @@ export default { category="tertiary" icon="question-o" class="ml-auto" - :aria-label="$options.i18n.contactAdmin" + :aria-label="popoverText" size="small" data-testid="contact-admin-popover-trigger" /> @@ -111,7 +114,7 @@ export default { triggers="hover focus" data-testid="contact-admin-popover" > - <p>{{ $options.i18n.contactAdmin }}</p> + <p>{{ popoverText }}</p> <gl-link :href="value.url" class="font-size-inherit" |