forked from gitea/gitea
Enhance closed PR and Issue status in the list (#6000)
* working version * Update options/locale/locale_en-US.ini Co-Authored-By: adelowo <adelowomailbox@gmail.com> * update templates
This commit is contained in:
parent
f60b1d8fe2
commit
2e85e70e38
|
@ -733,6 +733,8 @@ issues.action_milestone_no_select = No milestone
|
||||||
issues.action_assignee = Assignee
|
issues.action_assignee = Assignee
|
||||||
issues.action_assignee_no_select = No assignee
|
issues.action_assignee_no_select = No assignee
|
||||||
issues.opened_by = opened %[1]s by <a href="%[2]s">%[3]s</a>
|
issues.opened_by = opened %[1]s by <a href="%[2]s">%[3]s</a>
|
||||||
|
pulls.merged_by = merged %[1]s by <a href="%[2]s">%[3]s</a>
|
||||||
|
issues.closed_by = closed %[1]s by <a href="%[2]s">%[3]s</a>
|
||||||
issues.opened_by_fake = opened %[1]s by %[2]s
|
issues.opened_by_fake = opened %[1]s by %[2]s
|
||||||
issues.previous = Previous
|
issues.previous = Previous
|
||||||
issues.next = Next
|
issues.next = Next
|
||||||
|
|
|
@ -205,7 +205,23 @@
|
||||||
{{end}}
|
{{end}}
|
||||||
|
|
||||||
<p class="desc">
|
<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}}
|
{{$tasks := .GetTasks}}
|
||||||
{{if gt $tasks 0}}
|
{{if gt $tasks 0}}
|
||||||
{{$tasksDone := .GetTasksDone}}
|
{{$tasksDone := .GetTasksDone}}
|
||||||
|
|
Loading…
Reference in New Issue