Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 14, 2024
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0e18a26
Use a common message template instead of a special one
lunny Aug 19, 2024
6dfaa72
Follow @wxiaoguang's suggestion
lunny Aug 20, 2024
a109192
Only show function name for admin
lunny Sep 13, 2024
a2e2705
Merge branch 'main' into lunny/load_fail_message
lunny Sep 13, 2024
cac69d3
Revert "Only show function name for admin"
lunny Sep 13, 2024
c42617d
Merge branch 'main' into lunny/load_fail_message
lunny Sep 13, 2024
ad698c2
Merge branch 'main' into lunny/load_fail_message
techknowlogick Sep 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion options/locale/locale_en-US.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ filter.public = Public
filter.private = Private

no_results_found = No results found.
load_failed = Load %s failed because of internal error

[search]
search = Search...
Expand Down Expand Up @@ -1274,7 +1275,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
Expand Down
2 changes: 1 addition & 1 deletion routers/web/repo/commit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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("load_failed", "tags"))
} else {
ctx.Data["CommitsTagsMap"] = commitsTagsMap
}
Expand Down