Use a common message template instead of a special one (#31878)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 818a8aa5b0debc83505135e07c45e971cb00eab1..601671d8b907d2e7bb8d5c2f637672ed05bc10b4 100644 (file)
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -159,6 +159,7 @@ filter.public = Public
 filter.private = Private
 
 no_results_found = No results found.
+internal_error_skipped = Internal error occurred but is skipped: %s
 
 [search]
 search = Search...
@@ -1279,7 +1280,6 @@ commit_graph.color = Color
 commit.contained_in = This commit is contained in:
 commit.contained_in_default_branch = This commit is part of the default branch
 commit.load_referencing_branches_and_tags = Load branches and tags referencing this commit
-commit.load_tags_failed = Load tags failed because of internal error
 blame = Blame
 download_file = Download file
 normal_view = Normal View

diff --git a/routers/web/repo/commit.go b/routers/web/repo/commit.go
index c91d5fad0565e10ff53548ff57670068431afa97..a433dd228e3ebeec1a93f9e86ea403df4b470dc8 100644 (file)
--- a/routers/web/repo/commit.go
+++ b/routers/web/repo/commit.go
@@ -90,7 +90,7 @@ func Commits(ctx *context.Context) {
        commitsTagsMap, err := repo_model.FindTagsByCommitIDs(ctx, ctx.Repo.Repository.ID, commitIDs...)
        if err != nil {
                log.Error("FindTagsByCommitIDs: %v", err)
-               ctx.Flash.Error(ctx.Tr("repo.commit.load_tags_failed"))
+               ctx.Flash.Error(ctx.Tr("internal_error_skipped", "FindTagsByCommitIDs"))
        } else {
                ctx.Data["CommitsTagsMap"] = commitsTagsMap
        }