Fix mail template error (#29410)

pull/29437/head
wxiaoguang 9 months ago committed by GitHub
parent 4f70ebb684
commit eb2fc1818b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 10
      modules/templates/mailer.go
  2. 2
      templates/mail/notify/repo_transfer.tmpl

@ -44,11 +44,17 @@ func buildSubjectBodyTemplate(stpl *texttmpl.Template, btpl *template.Template,
}
if _, err := stpl.New(name).
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).
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")
}
}
}

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

Loading…
Cancel
Save