realaravinth/forgejo-federation
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity

Fix mail template error (#29410)

Browse source 
(cherry picked from commit eb2fc1818b00b7ca6f8c21bb490a8e8be1e62f9a)
This commit is contained in:
wxiaoguang 2024-02-27 06:31:30 +08:00 committed by Earl Warren
parent ef95d1d533
commit 8f3ef5aa71
WARNING! Although there is a key with this ID in the database it does not verify this commit! This commit is SUSPICIOUS.
GPG key ID: 0579CB2928A78A00
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
modules/templates/mailer.go
View file

@ -44,11 +44,17 @@ func buildSubjectBodyTemplate(stpl *texttmpl.Template, btpl *template.Template,
} }
if _, err := stpl.New(name). if _, err := stpl.New(name).
Parse(string(subjectContent)); err != nil { Parse(string(subjectContent)); err != nil {
log.Warn("Failed to parse template [%s/subject]: %v", name, err) log.Error("Failed to parse template [%s/subject]: %v", name, err)
if !setting.IsProd {
log.Fatal("Please fix the mail template error")
}
} }
if _, err := btpl.New(name). if _, err := btpl.New(name).
Parse(string(bodyContent)); err != nil { Parse(string(bodyContent)); err != nil {
log.Warn("Failed to parse template [%s/body]: %v", name, err) log.Error("Failed to parse template [%s/body]: %v", name, err)
if !setting.IsProd {
log.Fatal("Please fix the mail template error")
}
} }
} }

2
templates/mail/notify/repo_transfer.tmpl
View file

@ -5,7 +5,7 @@
<title>{{.Subject}}</title> <title>{{.Subject}}</title>
</head> </head>
{{$url := HTMLFormat "<a href='%[1]s'>%[2]s</a>" .Link .Repo)}} {{$url := HTMLFormat "<a href='%[1]s'>%[2]s</a>" .Link .Repo}}
<body> <body>
<p>{{.Subject}}. <p>{{.Subject}}.
{{.locale.Tr "mail.repo.transfer.body" $url}} {{.locale.Tr "mail.repo.transfer.body" $url}}