diff options
Diffstat (limited to 'templates/repo/issue/list.tmpl')
| -rw-r--r-- | templates/repo/issue/list.tmpl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index f64de74e85..ffc952c8b3 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -279,7 +279,7 @@ {{end}} {{if gt $rejectOfficial 0}} - <span class="rejects">{{svg "octicon-request-changes" 16}} + <span class="rejects">{{svg "octicon-diff" 16}} {{$.i18n.Tr (TrN $.i18n.Lang $rejectOfficial "repo.pulls.reject_count_1" "repo.pulls.reject_count_n") $rejectOfficial}} </span> {{end}} @@ -291,7 +291,7 @@ {{end}} {{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> + <span class="conflicting">{{svg "octicon-x" 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}} </p> |