improvements

Author: lunny

options/locale/locale_en-US.ini

@@ -1630,6 +1630,8 @@ issues.reopen_comment_issue = Reopen with Comment
 issues.create_comment = Comment
 issues.comment.blocked_user = Cannot create or edit comment because you are blocked by the poster or repository owner.
 issues.not_closed = The issue is not closed.
+issues.reopen_not_allowed = No permission to reopen this issue.
+issues.reopen_not_allowed_merged = A pull request cannot be reopened after it has been merged.
 issues.comment.empty_content = The comment content cannot be empty.
 issues.already_closed = The issue is already closed.
 issues.closed_at = `closed this issue <a id="%[1]s" href="#%[1]s">%[2]s</a>`
@@ -1952,7 +1954,7 @@ pulls.has_merged = Failed: The pull request has been merged. You cannot merge ag
 pulls.push_rejected = Push Failed: The push was rejected. Review the Git Hooks for this repository.
 pulls.push_rejected_summary = Full Rejection Message
 pulls.push_rejected_no_message = Push Failed: The push was rejected but there was no remote message. Review the Git Hooks for this repository.
-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_checks_success = All checks were successful
 pulls.status_checks_warning = Some checks reported warnings

routers/web/repo/issue_comment.go

@@ -102,7 +102,7 @@ func NewComment(ctx *context.Context) {
 		pr, err := issues_model.GetUnmergedPullRequest(ctx, pull.HeadRepoID, pull.BaseRepoID, pull.HeadBranch, pull.BaseBranch, pull.Flow)
 		if err != nil {
 			if !issues_model.IsErrPullRequestNotExist(err) {
-				ctx.JSONError(ctx.Tr("repo.issues.dependency.pr_close_blocked"))
+				ctx.JSONError(err.Error())
 				return
 			}
 		}
@@ -121,10 +121,6 @@ func NewComment(ctx *context.Context) {
 			return
 		}
 
-		// Regenerate patch and test conflict.
-		pull.HeadCommitID = ""
-		pull_service.StartPullRequestCheckImmediately(ctx, pull)
-
 		// check whether the ref of PR <refs/pulls/pr_index/head> in base repo is consistent with the head commit of head branch in the head repo
 		// get head commit of PR
 		if pull.Flow == issues_model.PullRequestFlowGithub {
@@ -176,6 +172,10 @@ func NewComment(ctx *context.Context) {
 				}
 			}
 		}
+
+		// Regenerate patch and test conflict.
+		pull.HeadCommitID = ""
+		pull_service.StartPullRequestCheckImmediately(ctx, pull)
 	case "close":
 		if issue.IsClosed {
 			ctx.JSONError(ctx.Tr("repo.issues.already_closed"))