Mirrors/gitea
0
0 Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-10-08 09:53:10 +02:00
Code Issues 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 LakinandAntoine GIRARD authored and GitHub committed 2020-02-07 17:38:18 +01:00
1 parent cf33a18a5c
commit 6e6da2c276
3 files changed
+4 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

templates/repo/issue/list.tmpl
+1 -1
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>
templates/user/dashboard/issues.tmpl
+1 -1
View File
@@ -153,7 +153,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>