diff options
| author | James Lakin <jamesorlakin@users.noreply.github.com> | 2020-02-07 16:38:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-07 17:38:18 +0100 |
| commit | 6e6da2c2765ef7b350a7c9139ffb2444f2383151 (patch) | |
| tree | 680a366540a4babe88c7cad5c0241673a5d1446f | |
| parent | cf33a18a5c1cfc0a9995da48af61aefc7f2d2ac3 (diff) | |
| download | gitea-6e6da2c2765ef7b350a7c9139ffb2444f2383151.tar.gz gitea-6e6da2c2765ef7b350a7c9139ffb2444f2383151.zip | |
Tweak locale to respect singular conflicting file message in P… (#10177)
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
| -rw-r--r-- | options/locale/locale_en-US.ini | 3 | ||||
| -rw-r--r-- | templates/repo/issue/list.tmpl | 2 | ||||
| -rw-r--r-- | templates/user/dashboard/issues.tmpl | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 88fbce598f..2f7e0acb63 100644 --- a/options/locale/locale_en-US.ini +++ b/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. diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 16cee8619d..9cf6cdd972 100644 --- a/templates/repo/issue/list.tmpl +++ b/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> diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index 113dcf21f8..a5d7c1454e 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/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> |