From 6f2a441ed52722337137eb16f157ca076e3983be Mon Sep 17 00:00:00 2001 From: Minecon724 Date: Mon, 17 Mar 2025 13:37:59 +0100 Subject: [PATCH] Issue popup message that the issue doesn't exist Signed-off-by: Minecon724 --- options/locale/locale_en-US.ini | 1 + routers/web/repo/issue.go | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 2a8c789385..2387c78f9f 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -247,6 +247,7 @@ report_message = If you believe that this is a Forgejo bug, please search for is not_found = The target couldn't be found. network_error = Network error server_internal = Internal server error +issue_not_found = Issue doesn't exist [startpage] app_desc = A painless, self-hosted Git service diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index e45abd3952..5b7ac17372 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -2218,7 +2218,7 @@ func GetIssueInfo(ctx *context.Context) { issue, err := issues_model.GetIssueWithAttrsByIndex(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) if err != nil { if issues_model.IsErrIssueNotExist(err) { - ctx.Error(http.StatusNotFound) + ctx.Error(http.StatusNotFound, ctx.Locale.TrString("error.issue_not_found")) } else { ctx.Error(http.StatusInternalServerError, "GetIssueByIndex", err.Error()) } @@ -2228,13 +2228,13 @@ func GetIssueInfo(ctx *context.Context) { if issue.IsPull { // Need to check if Pulls are enabled and we can read Pulls if !ctx.Repo.Repository.CanEnablePulls() || !ctx.Repo.CanRead(unit.TypePullRequests) { - ctx.Error(http.StatusNotFound) + ctx.Error(http.StatusNotFound, ctx.Locale.TrString("error.issue_not_found")) return } } else { // Need to check if Issues are enabled and we can read Issues if !ctx.Repo.CanRead(unit.TypeIssues) { - ctx.Error(http.StatusNotFound) + ctx.Error(http.StatusNotFound, ctx.Locale.TrString("error.issue_not_found")) return } }