mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-09-07 07:03:21 +00:00
fix message key (#13240)
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
This commit is contained in:
parent
f0fe5683fe
commit
16120c059f
1 changed files with 2 additions and 2 deletions
|
@ -870,8 +870,8 @@ func MergePullRequest(ctx *context.Context, form auth.MergePullRequestForm) {
|
||||||
} else if models.IsErrRebaseConflicts(err) {
|
} else if models.IsErrRebaseConflicts(err) {
|
||||||
conflictError := err.(models.ErrRebaseConflicts)
|
conflictError := err.(models.ErrRebaseConflicts)
|
||||||
flashError, err := ctx.HTMLString(string(tplAlertDetails), map[string]interface{}{
|
flashError, err := ctx.HTMLString(string(tplAlertDetails), map[string]interface{}{
|
||||||
"Message": ctx.Tr("repo.editor.rebase_conflict", utils.SanitizeFlashErrorString(conflictError.CommitSHA)),
|
"Message": ctx.Tr("repo.pulls.rebase_conflict", utils.SanitizeFlashErrorString(conflictError.CommitSHA)),
|
||||||
"Summary": ctx.Tr("repo.editor.rebase_conflict_summary"),
|
"Summary": ctx.Tr("repo.pulls.rebase_conflict_summary"),
|
||||||
"Details": utils.SanitizeFlashErrorString(conflictError.StdErr) + "<br>" + utils.SanitizeFlashErrorString(conflictError.StdOut),
|
"Details": utils.SanitizeFlashErrorString(conflictError.StdErr) + "<br>" + utils.SanitizeFlashErrorString(conflictError.StdOut),
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
Loading…
Reference in a new issue