tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-07-31 22:58:35 +00:00
Code Releases Activity

Make distinction between DisplayName and Username in email templates (#6495)

Browse Source 
* Make distinction between DisplayName and Username in email templates

Store the actual username in the variable named Username and store the
separate DisplayName in another variable. This allows us to access the
actual username when we need, which currently fails if a user has set a
full name.

Fixes #6161

* Use u.Name directly

No need for extra function, also change use in all mail sending
functions here

* Don't include Username when not used
This commit is contained in:
mrsdizzie
2019-04-04 03:52:48 -04:00
committed by Lauris BH
parent 3f4e2d9d37
commit 04003d9dc7
5 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/mail/auth/activate_email.tmpl
View File

@@ -2,11 +2,11 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>{{.Username}}, please verify your e-mail address</title>
<title>{{.DisplayName}}, please verify your e-mail address</title>
</head>
<body>
<p>Hi <b>{{.Username}}</b>,</p>
<p>Hi <b>{{.DisplayName}}</b>,</p>
<p>Please click the following link to verify your email address within <b>{{.ActiveCodeLives}}</b>:</p>
<p><a href="{{AppUrl}}user/activate_email?code={{.Code}}&email={{.Email}}">{{AppUrl}}user/activate_email?code={{.Code}}&email={{.Email}}</a></p>
<p>Not working? Try copying and pasting it to your browser.</p>