wangwei
/
aiforge
Not watched
1
0
Fork 0
Code
Releases 128 Wiki Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain
Browse Source

Fix templates (#10596) 

Signed-off-by: jolheiser <john.olheiser@gmail.com>
tags/v1.12.0-dev
John Olheiser GitHub 5 years ago
parent
cb54f6dc8a
commit
57b8b04bcb
2 changed files with 2 additions and 2 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      templates/repo/issue/list.tmpl
  2. +1
    -1
      templates/user/dashboard/issues.tmpl

+ 1
- 1
templates/repo/issue/list.tmpl View File

@@ -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}}


+ 1
- 1
templates/user/dashboard/issues.tmpl View File

@@ -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}}


Write Preview
Loading…
Cancel
Save