From 28e5e7fcbca9cd2030c156ec45f6f3cf67b3682e Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 30 Apr 2020 15:49:12 +0200 Subject: Add a 'this' to issue close/reopened messages (#11204) * add a 'this' to issue close/reopened messages * add 'this issue/pull request' and create new localization entries Co-authored-by: Lauris BH --- templates/repo/issue/view_content/comments.tmpl | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index 0353e10135..a3b4fb81e0 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -75,7 +75,11 @@ {{.Poster.GetDisplayName}} - {{$.i18n.Tr "repo.issues.reopened_at" .EventTag $createdStr | Safe}} + {{if .Issue.IsPull }} + {{$.i18n.Tr "repo.pulls.reopened_at" .EventTag $createdStr | Safe}} + {{else}} + {{$.i18n.Tr "repo.issues.reopened_at" .EventTag $createdStr | Safe}} + {{end}} {{else if eq .Type 2}} @@ -86,7 +90,11 @@ {{.Poster.GetDisplayName}} - {{$.i18n.Tr "repo.issues.closed_at" .EventTag $createdStr | Safe}} + {{if .Issue.IsPull }} + {{$.i18n.Tr "repo.pulls.closed_at" .EventTag $createdStr | Safe}} + {{else}} + {{$.i18n.Tr "repo.issues.closed_at" .EventTag $createdStr | Safe}} + {{end}} {{else if eq .Type 28}} -- cgit v1.2.3