mirror
/
gitea
mirror of https://github.com/go-gitea/gitea
2
0
Fork 0
Code Issues Releases Wiki Activity

Fix mail template error (#29410)

Browse Source
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
2 changed files with 9 additions and 3 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 10
      modules/templates/mailer.go
  2. 2
      templates/mail/notify/repo_transfer.tmpl

10
modules/templates/mailer.go
Unescape 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
Unescape 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}}

Write Preview
Loading…
Cancel
Save