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
go-gitea · Apr 16, 2020 · e938266 · e938266
1 parent 9ffa892
commit e938266
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
@@ -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.status_checking = Some checks are pending
 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_success = Branch update was successful
 pulls.update_not_allowed = You are not allowed to update branch

diff --git a/templates/repo/pulls/status.tmpl b/templates/repo/pulls/status.tmpl
@@ -4,6 +4,10 @@
  {{$.i18n.Tr "repo.pulls.status_checking"}}
  {{else if eq .LatestCommitStatus.State "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"}}
  {{$.i18n.Tr "repo.pulls.status_checks_error"}}
  {{else}}