lavender-legacy
/
gitea
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add missing commit states to PR checks template (#11085) 

* Add missing commit states to PR checks template

* Add separate translation strings for warning and error

* Fix failure status string

* Revert accidental change with whitespace
release/v1.15
CirnoT 2020-04-16 21:08:20 +02:00 committed by GitHub
parent 9ffa89249e
commit e93826675c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
options/locale/locale_en-US.ini
View File

@ -1134,7 +1134,9 @@ pulls.push_rejected_no_message = Merge Failed: The push was rejected but there w
pulls.open_unmerged_pull_exists = `You cannot perform a reopen operation because there is a pending pull request (#%d) with identical properties.` pulls.open_unmerged_pull_exists = `You cannot perform a reopen operation because there is a pending pull request (#%d) with identical properties.`
pulls.status_checking = Some checks are pending pulls.status_checking = Some checks are pending
pulls.status_checks_success = All checks were successful pulls.status_checks_success = All checks were successful
pulls.status_checks_error = Some checks failed pulls.status_checks_warning = Some checks reported warnings
pulls.status_checks_failure = Some checks failed
pulls.status_checks_error = Some checks reported errors
pulls.update_branch = Update branch pulls.update_branch = Update branch
pulls.update_branch_success = Branch update was successful pulls.update_branch_success = Branch update was successful
pulls.update_not_allowed = You are not allowed to update branch pulls.update_not_allowed = You are not allowed to update branch

4
templates/repo/pulls/status.tmpl
View File

@ -4,6 +4,10 @@
{{$.i18n.Tr "repo.pulls.status_checking"}} {{$.i18n.Tr "repo.pulls.status_checking"}}
{{else if eq .LatestCommitStatus.State "success"}} {{else if eq .LatestCommitStatus.State "success"}}
{{$.i18n.Tr "repo.pulls.status_checks_success"}} {{$.i18n.Tr "repo.pulls.status_checks_success"}}
{{else if eq .LatestCommitStatus.State "warning"}}
{{$.i18n.Tr "repo.pulls.status_checks_warning"}}
{{else if eq .LatestCommitStatus.State "failure"}}
{{$.i18n.Tr "repo.pulls.status_checks_failure"}}
{{else if eq .LatestCommitStatus.State "error"}} {{else if eq .LatestCommitStatus.State "error"}}
{{$.i18n.Tr "repo.pulls.status_checks_error"}} {{$.i18n.Tr "repo.pulls.status_checks_error"}}
{{else}} {{else}}