diff options
author | Eugenia Grieff <egrieff@gitlab.com> | 2019-09-13 12:35:28 +0100 |
---|---|---|
committer | Eugenia Grieff <egrieff@gitlab.com> | 2019-09-13 12:35:28 +0100 |
commit | dd176192aa2050fb57aecd0c6852d3a4e7cae42b (patch) | |
tree | f8541ed9d8e88ea97b5989694be3c309df6b307e /app/helpers/issues_helper.rb | |
parent | c0feda92c356ec89d78e0a609830f711a410b045 (diff) | |
download | gitlab-ce-dd176192aa2050fb57aecd0c6852d3a4e7cae42b.tar.gz |
Apply patch to fix template57783-better-indication-that-an-issue-has-been-duplicated
- Update pot file to include missing internationalization
Diffstat (limited to 'app/helpers/issues_helper.rb')
-rw-r--r-- | app/helpers/issues_helper.rb | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index b4bcfbeb59a..8b6fecb9676 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -152,9 +152,19 @@ module IssuesHelper def issue_closed_link(issue, current_user, css_class: '') if issue.moved? && can?(current_user, :read_issue, issue.moved_to) - link_to('(moved)', issue.moved_to, class: css_class) + link_to(s_('IssuableStatus|moved'), issue.moved_to, class: css_class) elsif issue.duplicated? && can?(current_user, :read_issue, issue.duplicated_to) - link_to('(duplicated)', issue.duplicated_to, class: css_class) + link_to(s_('IssuableStatus|duplicated'), issue.duplicated_to, class: css_class) + end + end + + def issue_closed_text(issue, current_user) + link = issue_closed_link(issue, current_user, css_class: 'text-white text-underline') + + if link + s_('IssuableStatus|Closed (%{link})').html_safe % { link: link } + else + s_('IssuableStatus|Closed') end end |