diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2024-02-15 05:48:45 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-14 21:48:45 +0000 |
| commit | f3eb835886031df7a562abc123c3f6011c81eca8 (patch) | |
| tree | 6db218680b00a81f2ea46675d5dde94642a232b9 /templates/mail | |
| parent | 94d06be035bac468129903c9f32e785baf3c1c3b (diff) | |
| download | gitea-f3eb835886031df7a562abc123c3f6011c81eca8.tar.gz gitea-f3eb835886031df7a562abc123c3f6011c81eca8.zip | |
Refactor locale&string&template related code (#29165)
Clarify when "string" should be used (and be escaped), and when
"template.HTML" should be used (no need to escape)
And help PRs like #29059 , to render the error messages correctly.
Diffstat (limited to 'templates/mail')
| -rw-r--r-- | templates/mail/issue/assigned.tmpl | 4 | ||||
| -rw-r--r-- | templates/mail/issue/default.tmpl | 2 | ||||
| -rw-r--r-- | templates/mail/notify/repo_transfer.tmpl | 2 | ||||
| -rw-r--r-- | templates/mail/release.tmpl | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/templates/mail/issue/assigned.tmpl b/templates/mail/issue/assigned.tmpl index d02ea39918..e80bd2fc31 100644 --- a/templates/mail/issue/assigned.tmpl +++ b/templates/mail/issue/assigned.tmpl @@ -13,9 +13,9 @@ <body> <p> {{if .IsPull}} - {{.locale.Tr "mail.issue_assigned.pull" .Doer.Name $link $repo_url | Str2html}} + {{.locale.Tr "mail.issue_assigned.pull" .Doer.Name ($link|Safe) ($repo_url|Safe)}} {{else}} - {{.locale.Tr "mail.issue_assigned.issue" .Doer.Name $link $repo_url | Str2html}} + {{.locale.Tr "mail.issue_assigned.issue" .Doer.Name ($link|Safe) ($repo_url|Safe)}} {{end}} </p> <div class="footer"> diff --git a/templates/mail/issue/default.tmpl b/templates/mail/issue/default.tmpl index 422a4f0461..b5a7ab95cf 100644 --- a/templates/mail/issue/default.tmpl +++ b/templates/mail/issue/default.tmpl @@ -28,7 +28,7 @@ {{$newShortSha := ShortSha .Comment.NewCommit}} {{$newCommitLink := printf "<a href='%[1]s'><b>%[2]s</b></a>" (Escape $newCommitUrl) (Escape $newShortSha)}} - {{.locale.Tr "mail.issue.action.force_push" .Doer.Name .Comment.Issue.PullRequest.HeadBranch $oldCommitLink $newCommitLink | Str2html}} + {{.locale.Tr "mail.issue.action.force_push" .Doer.Name .Comment.Issue.PullRequest.HeadBranch ($oldCommitLink|Safe) ($newCommitLink|Safe)}} {{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) | Str2html}} {{end}} diff --git a/templates/mail/notify/repo_transfer.tmpl b/templates/mail/notify/repo_transfer.tmpl index 43d95b3ff0..1b23593f6b 100644 --- a/templates/mail/notify/repo_transfer.tmpl +++ b/templates/mail/notify/repo_transfer.tmpl @@ -8,7 +8,7 @@ {{$url := printf "<a href='%[1]s'>%[2]s</a>" (Escape .Link) (Escape .Repo)}} <body> <p>{{.Subject}}. - {{.locale.Tr "mail.repo.transfer.body" $url | Str2html}} + {{.locale.Tr "mail.repo.transfer.body" ($url|Safe)}} </p> <p> --- diff --git a/templates/mail/release.tmpl b/templates/mail/release.tmpl index f588d8224f..96dc769993 100644 --- a/templates/mail/release.tmpl +++ b/templates/mail/release.tmpl @@ -15,7 +15,7 @@ {{$repo_url := printf "<a href='%s'>%s</a>" (.Release.Repo.HTMLURL | Escape) (.Release.Repo.FullName | Escape)}} <body> <p> - {{.locale.Tr "mail.release.new.text" .Release.Publisher.Name $release_url $repo_url | Str2html}} + {{.locale.Tr "mail.release.new.text" .Release.Publisher.Name ($release_url|Safe) ($repo_url|Safe)}} </p> <h4>{{.locale.Tr "mail.release.title" .Release.Title}}</h4> <p> |