Icycoide/RSCC-Forge
1
0
Fork 0
forked from kevadesu/forgejo
Code Pull requests Activity

Tweak locale to respect singular conflicting file message in P… (#10177)

Browse source 
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
This commit is contained in:
James Lakin 2020-02-07 16:38:18 +00:00 • committed by GitHub
parent cf33a18a5c
commit 6e6da2c276
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
templates/repo/issue/list.tmpl
View file

@ -269,7 +269,7 @@
{{end}}
{{if .IsPull}}
{{if (len .PullRequest.ConflictedFiles) gt 0}}
<span class="conflicting"><i class="octicon octicon-mirror"></i> {{$.i18n.Tr "repo.pulls.num_conflicting_files" (len .PullRequest.ConflictedFiles)}}</span>
<span class="conflicting"><i class="octicon octicon-mirror"></i> {{$.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>