Commit 1c786a5b authored by Tom Quirk's avatar Tom Quirk

Address reviewer feedback

parent 6f4aa7aa
<script> <script>
import { GlIcon, GlLink, GlTable, GlTooltipDirective } from '@gitlab/ui'; import { GlIcon, GlLink, GlTable, GlTooltipDirective } from '@gitlab/ui';
import { __ } from '~/locale'; import { sprintf, s__, __ } from '~/locale';
import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
export default { export default {
...@@ -56,6 +56,13 @@ export default { ...@@ -56,6 +56,13 @@ export default {
]; ];
}, },
}, },
methods: {
getStatusTooltipTitle(integration) {
return sprintf(s__('Integrations|%{integrationName}: active'), {
integrationName: integration.name,
});
},
},
}; };
</script> </script>
...@@ -67,11 +74,7 @@ export default { ...@@ -67,11 +74,7 @@ export default {
v-gl-tooltip v-gl-tooltip
name="check" name="check"
class="gl-text-green-500" class="gl-text-green-500"
:title=" :title="getStatusTooltipTitle(integration)"
sprintf(s__('Integrations|%{integrationName}: active'), {
integrationName: item.name,
})
"
/> />
</template> </template>
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
.gl-alert-actions .gl-alert-actions
= link_to _('Go to Webhooks'), project_hooks_path(@project), class: 'gl-button btn gl-alert-action btn-info' = link_to _('Go to Webhooks'), project_hooks_path(@project), class: 'gl-button btn gl-alert-action btn-info'
%h3= s_('Integrations|Integrations') %h3= _('Integrations')
- integrations_link_start = '<a href="%{url}">'.html_safe % { url: help_page_url('user/project/integrations/overview') } - integrations_link_start = '<a href="%{url}">'.html_safe % { url: help_page_url('user/project/integrations/overview') }
- webhooks_link_start = '<a href="%{url}">'.html_safe % { url: project_hooks_path(@project) } - webhooks_link_start = '<a href="%{url}">'.html_safe % { url: project_hooks_path(@project) }
%p= _("%{integrations_link_start}Integrations%{link_end} enable you to make third-party applications part of your GitLab workflow. If the available integrations don't meet your needs, consider using a %{webhooks_link_start}webhook%{link_end}.").html_safe % { integrations_link_start: integrations_link_start, webhooks_link_start: webhooks_link_start, link_end: '</a>'.html_safe } %p= _("%{integrations_link_start}Integrations%{link_end} enable you to make third-party applications part of your GitLab workflow. If the available integrations don't meet your needs, consider using a %{webhooks_link_start}webhook%{link_end}.").html_safe % { integrations_link_start: integrations_link_start, webhooks_link_start: webhooks_link_start, link_end: '</a>'.html_safe }
......
...@@ -17125,9 +17125,6 @@ msgstr "" ...@@ -17125,9 +17125,6 @@ msgstr ""
msgid "Integrations|Includes commit title and branch" msgid "Integrations|Includes commit title and branch"
msgstr "" msgstr ""
msgid "Integrations|Integrations"
msgstr ""
msgid "Integrations|Issues created in Jira are shown here once you have created the issues in project setup in Jira." msgid "Integrations|Issues created in Jira are shown here once you have created the issues in project setup in Jira."
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment