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

Co-authored-by: Antoine GIRARD <[email protected]>

Author: jamesorlakin

options/locale/locale_en-US.ini

@@ -1066,7 +1066,8 @@ pulls.blocked_by_rejection = "This Pull Request has changes requested by an offi
 pulls.can_auto_merge_desc = This pull request can be merged automatically.
 pulls.cannot_auto_merge_desc = This pull request cannot be merged automatically due to conflicts.
 pulls.cannot_auto_merge_helper = Merge manually to resolve the conflicts.
-pulls.num_conflicting_files = "%d conflicting files"
+pulls.num_conflicting_files_1 = "%d conflicting file"
+pulls.num_conflicting_files_n = "%d conflicting files"
 pulls.no_merge_desc = This pull request cannot be merged because all repository merge options are disabled.
 pulls.no_merge_helper = Enable merge options in the repository settings or merge the pull request manually.
 pulls.no_merge_wip = This pull request can not be merged because it is marked as being a work in progress.

templates/repo/issue/list.tmpl

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

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