From 647b2649b1600107c5fec3505db691f78b2c1e2a Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 31 Aug 2022 17:58:54 +0200 Subject: Make sure fmt catches all templates (#20979) * Make sure fmt catches all templates Make's `wildcard` is not recursive so it missed many template files, fix that by using `find`. * Update Makefile --- templates/repo/issue/view_content/pull.tmpl | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'templates/repo/issue/view_content/pull.tmpl') diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index fd901f013e..1e07225300 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -1,10 +1,10 @@ -{{if or .PullReviewers .OriginalReviews }} +{{if or .PullReviewers .OriginalReviews}}

{{$.locale.Tr "repo.issues.review.reviewers"}}

{{range .PullReviewers}} - {{ $createdStr:= TimeSinceUnix .Review.UpdatedUnix $.locale }} + {{$createdStr:= TimeSinceUnix .Review.UpdatedUnix $.locale}}
@@ -71,7 +71,7 @@ {{- else if eq .Review.Type 4}}yellow {{else}}grey{{end}}"> - {{if .CanChange }} + {{if .CanChange}} {{if .Checked}} {{svg "octicon-trash"}} {{else}} {{svg "octicon-sync"}} {{end}} @@ -82,14 +82,14 @@
{{end}} {{range .OriginalReviews}} - {{ $createdStr:= TimeSinceUnix .UpdatedUnix $.locale }} + {{$createdStr:= TimeSinceUnix .UpdatedUnix $.locale}}
@@ -180,7 +180,7 @@
{{svg "octicon-x"}} - {{$.locale.Tr "repo.pulls.cannot_merge_work_in_progress" }} + {{$.locale.Tr "repo.pulls.cannot_merge_work_in_progress"}}
{{if or .HasIssuesOrPullsWritePermission .IsIssuePoster}} @@ -224,7 +224,7 @@ {{else if .IsBlockedByChangedProtectedFiles}}
{{svg "octicon-x" 16}} - {{$.locale.TrN $.ChangedProtectedFilesNum "repo.pulls.blocked_by_changed_protected_files_1" "repo.pulls.blocked_by_changed_protected_files_n" | Safe }} + {{$.locale.TrN $.ChangedProtectedFilesNum "repo.pulls.blocked_by_changed_protected_files_1" "repo.pulls.blocked_by_changed_protected_files_n" | Safe}}
{{range .ChangedProtectedFiles}}
{{.}}
@@ -248,7 +248,7 @@
- {{$.locale.Tr (printf "repo.signing.wont_sign.%s" .WontSignReason) }} + {{$.locale.Tr (printf "repo.signing.wont_sign.%s" .WontSignReason)}}
{{end}} @@ -278,7 +278,7 @@ {{else if .IsSigned}}
- {{$.locale.Tr (printf "repo.signing.wont_sign.%s" .WontSignReason) }} + {{$.locale.Tr (printf "repo.signing.wont_sign.%s" .WontSignReason)}}
{{end}} {{end}} @@ -290,7 +290,7 @@ {{$.locale.Tr "repo.pulls.outdated_with_base_branch"}}
- {{if and .UpdateAllowed .UpdateByRebaseAllowed }} + {{if and .UpdateAllowed .UpdateByRebaseAllowed}}