closed-social
/
gitea
3
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

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

Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
for-closed-social
James Lakin 4 years ago
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
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -1
      options/locale/locale_en-US.ini
  2. +1
    -1
      templates/repo/issue/list.tmpl
  3. +1
    -1
      templates/user/dashboard/issues.tmpl

+ 2
- 1
options/locale/locale_en-US.ini View File

@ -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.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_desc = This pull request cannot be merged automatically due to conflicts.
pulls.cannot_auto_merge_helper = Merge manually to resolve the 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_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_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. pulls.no_merge_wip = This pull request can not be merged because it is marked as being a work in progress.

+ 1
- 1
templates/repo/issue/list.tmpl View File

@ -269,7 +269,7 @@
{{end}} {{end}}
{{if .IsPull}} {{if .IsPull}}
{{if (len .PullRequest.ConflictedFiles) gt 0}} {{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}}
{{end}} {{end}}
</p> </p>

+ 1
- 1
templates/user/dashboard/issues.tmpl View File

@ -153,7 +153,7 @@
{{end}} {{end}}
{{if .IsPull}} {{if .IsPull}}
{{if (len .PullRequest.ConflictedFiles) gt 0}} {{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}}
{{end}} {{end}}
</p> </p>

Write Preview
Loading…
Cancel
Save