public/gitea
1
0 Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-10-26 06:16:56 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix(issues): use unified user display name pattern for more places (#39852)

Browse Source 
* Fix #39761

---------

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
Danny Wardandwxiaoguang authored and GitHub committed 2026-10-20 01:13:17 +00:00
1 parent f8dd2dd4cc
commit 3701fcec84
7 files changed
+31 -27
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

templates/mail/repo/issue/assigned.tmpl
+2 -2
View File
@@ -9,9 +9,9 @@
<body>
<p>
{{if .IsPull}}
{{.locale.Tr "mail.issue_assigned.pull" .Doer.Name $link $repo_url}}
{{.locale.Tr "mail.issue_assigned.pull" .Doer.DisplayNameWithFullName $link $repo_url}}
{{else}}
{{.locale.Tr "mail.issue_assigned.issue" .Doer.Name $link $repo_url}}
{{.locale.Tr "mail.issue_assigned.issue" .Doer.DisplayNameWithFullName $link $repo_url}}
{{end}}
</p>
{{if .CanReply}}<p>{{.locale.Tr "mail.reply_directly"}}.</p>{{end}}
templates/mail/repo/issue/default.tmpl
+11 -11
View File
@@ -17,34 +17,34 @@
{{$newShortSha := ShortSha .Comment.NewCommit}}
{{$newCommitLink := HTMLFormat "<a href='%[1]s'><b>%[2]s</b></a>" $newCommitUrl $newShortSha}}
{{.locale.Tr "mail.issue.action.force_push" .Doer.Name .Comment.Issue.PullRequest.HeadBranch $oldCommitLink $newCommitLink}}
{{.locale.Tr "mail.issue.action.force_push" .Doer.DisplayNameWithFullName .Comment.Issue.PullRequest.HeadBranch $oldCommitLink $newCommitLink}}
{{else}}
{{.locale.TrN (len .Comment.Commits) "mail.issue.action.push_1" "mail.issue.action.push_n" .Doer.Name .Comment.Issue.PullRequest.HeadBranch (len .Comment.Commits)}}
{{.locale.TrN (len .Comment.Commits) "mail.issue.action.push_1" "mail.issue.action.push_n" .Doer.DisplayNameWithFullName .Comment.Issue.PullRequest.HeadBranch (len .Comment.Commits)}}
{{end}}
</p>
{{end}}
<p>
{{if eq .ActionName "close"}}
{{.locale.Tr "mail.issue.action.close" .Doer.Name .Issue.Index}}
{{.locale.Tr "mail.issue.action.close" .Doer.DisplayNameWithFullName .Issue.Index}}
{{else if eq .ActionName "reopen"}}
{{.locale.Tr "mail.issue.action.reopen" .Doer.Name .Issue.Index}}
{{.locale.Tr "mail.issue.action.reopen" .Doer.DisplayNameWithFullName .Issue.Index}}
{{else if eq .ActionName "merge"}}
{{.locale.Tr "mail.issue.action.merge" .Doer.Name .Issue.Index .Issue.PullRequest.BaseBranch}}
{{.locale.Tr "mail.issue.action.merge" .Doer.DisplayNameWithFullName .Issue.Index .Issue.PullRequest.BaseBranch}}
{{else if eq .ActionName "approve"}}
{{.locale.Tr "mail.issue.action.approve" .Doer.Name}}
{{.locale.Tr "mail.issue.action.approve" .Doer.DisplayNameWithFullName}}
{{else if eq .ActionName "reject"}}
{{.locale.Tr "mail.issue.action.reject" .Doer.Name}}
{{.locale.Tr "mail.issue.action.reject" .Doer.DisplayNameWithFullName}}
{{else if eq .ActionName "review"}}
{{.locale.Tr "mail.issue.action.review" .Doer.Name}}
{{.locale.Tr "mail.issue.action.review" .Doer.DisplayNameWithFullName}}
{{else if eq .ActionName "review_dismissed"}}
{{.locale.Tr "mail.issue.action.review_dismissed" .Doer.Name .Comment.Review.Reviewer.Name}}
{{.locale.Tr "mail.issue.action.review_dismissed" .Doer.DisplayNameWithFullName .Comment.Review.Reviewer.DisplayNameWithFullName}}
{{else if eq .ActionName "ready_for_review"}}
{{.locale.Tr "mail.issue.action.ready_for_review" .Doer.Name}}
{{.locale.Tr "mail.issue.action.ready_for_review" .Doer.DisplayNameWithFullName}}
{{end}}
{{- if eq .Body ""}}
{{if eq .ActionName "new"}}
{{.locale.Tr "mail.issue.action.new" .Doer.Name .Issue.Index}}
{{.locale.Tr "mail.issue.action.new" .Doer.DisplayNameWithFullName .Issue.Index}}
{{end}}
{{else}}
{{.Body}}
templates/shared/user/name.tmpl
+1 -1
View File
@@ -1 +1 @@
<a class="text muted" href="{{.HomeLink}}">{{.Name}}{{if .FullName}} ({{.FullName}}){{end}}</a>{{template "shared/user/user_type_label" .}}
<a class="text muted" href="{{.HomeLink}}">{{.DisplayNameWithFullName}}</a>{{template "shared/user/user_type_label" .}}