forks/forgejo
1
0
Fork 0
Code Releases Activity

Remove title from email heads (#3810)

Browse source 
One part of https://codeberg.org/forgejo/forgejo/pulls/3316, though it may have a little more files touched because I re-created the changes.

> Removed HTML `<title>` part in `<head>` that was present inconsistently in these emails. It doesn't appear to be used by other websites. After all, these are emails, not webpages.

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3810
Reviewed-by: Otto <otto@codeberg.org>
This commit is contained in:
0ko 2024-05-17 10:10:33 +00:00
parent 45a41811de
commit f9ac5b327a
12 changed files with 0 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
options/locale/locale_en-US.ini
View file

@ -473,12 +473,10 @@ link_not_working_do_paste = Does the link not work? Try copying and pasting it i
hi_user_x = Hi <b>%s</b>, hi_user_x = Hi <b>%s</b>,
activate_account = Please activate your account activate_account = Please activate your account
activate_account.title = %s, please activate your account
activate_account.text_1 = Hi <b>%[1]s</b>, thanks for registering at %[2]s! activate_account.text_1 = Hi <b>%[1]s</b>, thanks for registering at %[2]s!
activate_account.text_2 = Please click the following link to activate your account within <b>%s</b>: activate_account.text_2 = Please click the following link to activate your account within <b>%s</b>:
activate_email = Verify your email address activate_email = Verify your email address
activate_email.title = %s, please verify your email address
activate_email.text = Please click the following link to verify your email address within <b>%s</b>: activate_email.text = Please click the following link to verify your email address within <b>%s</b>:
admin.new_user.subject = New user %s just signed up admin.new_user.subject = New user %s just signed up
@ -486,13 +484,11 @@ admin.new_user.user_info = User information
admin.new_user.text = Please <a href="%s">click here</a> to manage this user from the admin panel. admin.new_user.text = Please <a href="%s">click here</a> to manage this user from the admin panel.
register_notify = Welcome to Forgejo register_notify = Welcome to Forgejo
register_notify.title = %[1]s, welcome to %[2]s
register_notify.text_1 = this is your registration confirmation email for %s! register_notify.text_1 = this is your registration confirmation email for %s!
register_notify.text_2 = You can sign into your account using your username: %s register_notify.text_2 = You can sign into your account using your username: %s
register_notify.text_3 = If someone else made this account for you, you will need to <a href="%s">set your password</a> first. register_notify.text_3 = If someone else made this account for you, you will need to <a href="%s">set your password</a> first.
reset_password = Recover your account reset_password = Recover your account
reset_password.title = %s, we have received a request to recover your account
reset_password.text = If this was you, please click the following link to recover your account within <b>%s</b>: reset_password.text = If this was you, please click the following link to recover your account within <b>%s</b>:
register_success = Registration successful register_success = Registration successful

1
services/mailer/mail_test.go
View file

@ -36,7 +36,6 @@ const bodyTpl = `
<html> <html>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>{{.Subject}}</title>
</head> </head>
<body> <body>

1
templates/mail/auth/activate.tmpl
View file

@ -3,7 +3,6 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="format-detection" content="telephone=no,date=no,address=no,email=no,url=no"> <meta name="format-detection" content="telephone=no,date=no,address=no,email=no,url=no">
<title>{{.locale.Tr "mail.activate_account.title" (.DisplayName|DotEscape)}}</title>
</head> </head>
{{$activate_url := printf "%suser/activate?code=%s" AppUrl (QueryEscape .Code)}} {{$activate_url := printf "%suser/activate?code=%s" AppUrl (QueryEscape .Code)}}

1
templates/mail/auth/activate_email.tmpl
View file

@ -3,7 +3,6 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta Name="format-detection" content="telephone=no,date=no,address=no,email=no,url=no"> <meta Name="format-detection" content="telephone=no,date=no,address=no,email=no,url=no">
<title>{{.locale.Tr "mail.activate_email.title" (.DisplayName|DotEscape)}}</title>
</head> </head>
{{$activate_url := printf "%suser/activate_email?code=%s&email=%s" AppUrl (QueryEscape .Code) (QueryEscape .Email)}} {{$activate_url := printf "%suser/activate_email?code=%s&email=%s" AppUrl (QueryEscape .Code) (QueryEscape .Email)}}

1
templates/mail/auth/register_notify.tmpl
View file

@ -3,7 +3,6 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="format-detection" content="telephone=no,date=no,address=no,email=no,url=no"> <meta name="format-detection" content="telephone=no,date=no,address=no,email=no,url=no">
<title>{{.locale.Tr "mail.register_notify.title" (.DisplayName|DotEscape) AppName}}</title>
</head> </head>
{{$set_pwd_url := printf "%[1]suser/forgot_password" AppUrl}} {{$set_pwd_url := printf "%[1]suser/forgot_password" AppUrl}}

1
templates/mail/auth/reset_passwd.tmpl
View file

@ -3,7 +3,6 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="format-detection" content="telephone=no,date=no,address=no,email=no,url=no"> <meta name="format-detection" content="telephone=no,date=no,address=no,email=no,url=no">
<title>{{.locale.Tr "mail.reset_password.title" (.DisplayName|DotEscape)}}</title>
</head> </head>
{{$recover_url := printf "%suser/recover_account?code=%s" AppUrl (QueryEscape .Code)}} {{$recover_url := printf "%suser/recover_account?code=%s" AppUrl (QueryEscape .Code)}}

1
templates/mail/issue/assigned.tmpl
View file

@ -5,7 +5,6 @@
.footer { font-size:small; color:#666;} .footer { font-size:small; color:#666;}
</style> </style>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>{{.Subject}}</title>
</head> </head>
{{$repo_url := HTMLFormat "<a href='%s'>%s</a>" .Issue.Repo.HTMLURL .Issue.Repo.FullName}} {{$repo_url := HTMLFormat "<a href='%s'>%s</a>" .Issue.Repo.HTMLURL .Issue.Repo.FullName}}

1
templates/mail/issue/default.tmpl
View file

@ -2,7 +2,6 @@
<html> <html>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>{{.Subject}}</title>
<style> <style>
blockquote { padding-left: 1em; margin: 1em 0; border-left: 1px solid grey; color: #777} blockquote { padding-left: 1em; margin: 1em 0; border-left: 1px solid grey; color: #777}

1
templates/mail/notify/admin_new_user.tmpl
View file

@ -2,7 +2,6 @@
<html> <html>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>{{.Subject}}</title>
<style> <style>
blockquote { padding-left: 1em; margin: 1em 0; border-left: 1px solid grey; color: #777} blockquote { padding-left: 1em; margin: 1em 0; border-left: 1px solid grey; color: #777}

1
templates/mail/notify/collaborator.tmpl
View file

@ -5,7 +5,6 @@
.footer { font-size:small; color:#666;} .footer { font-size:small; color:#666;}
</style> </style>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>{{.Subject}}</title>
</head> </head>
<body> <body>

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

@ -2,7 +2,6 @@
<html> <html>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<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}}

1
templates/mail/release.tmpl
View file

@ -2,7 +2,6 @@
<html> <html>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>{{.Subject}}</title>
<style> <style>
blockquote { padding-left: 1em; margin: 1em 0; border-left: 1px solid grey; color: #777} blockquote { padding-left: 1em; margin: 1em 0; border-left: 1px solid grey; color: #777}