summaryrefslogtreecommitdiffstats
path: root/templates/repo/issue/list.tmpl
diff options
context:
space:
mode:
Diffstat (limited to 'templates/repo/issue/list.tmpl')
-rw-r--r--templates/repo/issue/list.tmpl18
1 files changed, 17 insertions, 1 deletions
diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl
index 10925a741d..f42492455c 100644
--- a/templates/repo/issue/list.tmpl
+++ b/templates/repo/issue/list.tmpl
@@ -205,7 +205,23 @@
{{end}}
<p class="desc">
- {{$.i18n.Tr "repo.issues.opened_by" $timeStr .Poster.HomeLink .Poster.Name | Safe}}
+ {{ $textToTranslate := "repo.issues.opened_by" }}
+ {{ if not .IsClosed }}
+ {{ $timeStr = TimeSinceUnix .CreatedUnix $.Lang }}
+ {{ else if and .IsClosed .IsPull }}
+ {{ $timeStr = TimeSinceUnix .ClosedUnix $.Lang }}
+ {{ if .PullRequest.HasMerged }}
+ {{ $textToTranslate = "repo.pulls.merged_by"}}
+ {{ else }}
+ {{ $textToTranslate = "repo.issues.closed_by"}}
+ {{ end }}
+ {{ else }}
+ {{ $timeStr = TimeSinceUnix .ClosedUnix $.Lang }}
+ {{ $textToTranslate = "repo.issues.closed_by"}}
+ {{ end }}
+
+ {{$.i18n.Tr $textToTranslate $timeStr .Poster.HomeLink .Poster.Name | Safe}}
+
{{$tasks := .GetTasks}}
{{if gt $tasks 0}}
{{$tasksDone := .GetTasksDone}}