From 871ca1e51f791c2d8b36830d521e90577608adf0 Mon Sep 17 00:00:00 2001 From: Scott Hampton Date: Wed, 27 Feb 2019 09:21:42 -0700 Subject: Adjusting internationalization of tooltip title Based on MR comments, changing how the i18n works for the tooltip title. --- app/views/ci/status/_icon.html.haml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'app/views/ci/status') diff --git a/app/views/ci/status/_icon.html.haml b/app/views/ci/status/_icon.html.haml index 64119d73e03..1ca0a55b156 100644 --- a/app/views/ci/status/_icon.html.haml +++ b/app/views/ci/status/_icon.html.haml @@ -1,10 +1,12 @@ - status = local_assigns.fetch(:status) - size = local_assigns.fetch(:size, 16) - type = local_assigns.fetch(:type, 'pipeline') -- title = local_assigns.fetch(:title, _("%{type}: %{label}" % {type: type.titleize, label: status.label})) - tooltip_placement = local_assigns.fetch(:tooltip_placement, "left") - path = local_assigns.fetch(:path, status.has_details? ? status.details_path : nil) - css_classes = "ci-status-link ci-status-icon ci-status-icon-#{status.group} has-tooltip" +- title = s_("PipelineStatusTooltip|Pipeline: %{ci_status}") % {ci_status: status.label} +- if type == 'commit' + - title = s_("PipelineStatusTooltip|Commit: %{ci_status}") % {ci_status: status.label} - if path = link_to path, class: css_classes, title: title, data: { html: true, placement: tooltip_placement } do -- cgit v1.2.1