diff options
| author | John Olheiser <john.olheiser@gmail.com> | 2020-03-04 00:56:53 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-04 08:56:53 +0200 |
| commit | afa1e1af16caa19e48de85d9d3697111ceeff9ce (patch) | |
| tree | 450440029022f825924c9deb64a02771dcb52f5f | |
| parent | 4a2b76d9c8e00769d81eed2f149b6da20cc2d339 (diff) | |
| download | gitea-afa1e1af16caa19e48de85d9d3697111ceeff9ce.tar.gz gitea-afa1e1af16caa19e48de85d9d3697111ceeff9ce.zip | |
Fix templates (#10596)
Signed-off-by: jolheiser <john.olheiser@gmail.com>
| -rw-r--r-- | templates/repo/issue/list.tmpl | 2 | ||||
| -rw-r--r-- | templates/user/dashboard/issues.tmpl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 0b618daaa9..60644409c3 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -268,7 +268,7 @@ </a> {{end}} {{if .IsPull}} - {{if and (not .PullRequest.HasMerged) ((len .PullRequest.ConflictedFiles) gt 0)}} + {{if and (not .PullRequest.HasMerged) (gt (len .PullRequest.ConflictedFiles) 0)}} <span class="conflicting">{{svg "octicon-mirror" 16}} {{$.i18n.Tr (TrN $.i18n.Lang (len .PullRequest.ConflictedFiles) "repo.pulls.num_conflicting_files_1" "repo.pulls.num_conflicting_files_n") (len .PullRequest.ConflictedFiles)}}</span> {{end}} {{end}} diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index 348af46857..de578b2820 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -170,7 +170,7 @@ </span> {{end}} {{if .IsPull}} - {{if and (not .PullRequest.HasMerged) ((len .PullRequest.ConflictedFiles) gt 0)}} + {{if and (not .PullRequest.HasMerged) (gt (len .PullRequest.ConflictedFiles) 0)}} <span class="conflicting">{{svg "octicon-mirror" 16}} {{$.i18n.Tr (TrN $.i18n.Lang (len .PullRequest.ConflictedFiles) "repo.pulls.num_conflicting_files_1" "repo.pulls.num_conflicting_files_n") (len .PullRequest.ConflictedFiles)}}</span> {{end}} {{end}} |