From 16120c059fcaa030fa45c74d41119ff96e3b4dc5 Mon Sep 17 00:00:00 2001
From: Iwasa Kazmi <kzmizzz@gmail.com>
Date: Thu, 22 Oct 2020 04:59:12 +0900
Subject: [PATCH] fix message key (#13240)
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
---
routers/repo/pull.go | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/routers/repo/pull.go b/routers/repo/pull.go
index 441bf9dbfe..1b3f835e4f 100644
--- a/routers/repo/pull.go
+++ b/routers/repo/pull.go
@@ -870,8 +870,8 @@ func MergePullRequest(ctx *context.Context, form auth.MergePullRequestForm) {
} else if models.IsErrRebaseConflicts(err) {
conflictError := err.(models.ErrRebaseConflicts)
flashError, err := ctx.HTMLString(string(tplAlertDetails), map[string]interface{}{
- "Message": ctx.Tr("repo.editor.rebase_conflict", utils.SanitizeFlashErrorString(conflictError.CommitSHA)),
- "Summary": ctx.Tr("repo.editor.rebase_conflict_summary"),
+ "Message": ctx.Tr("repo.pulls.rebase_conflict", utils.SanitizeFlashErrorString(conflictError.CommitSHA)),
+ "Summary": ctx.Tr("repo.pulls.rebase_conflict_summary"),
"Details": utils.SanitizeFlashErrorString(conflictError.StdErr) + "<br>" + utils.SanitizeFlashErrorString(conflictError.StdOut),
})
if err != nil {