jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Replace alternateEmail with fallbackEmail

Browse Source
This commit is contained in:
Johannes Zellner
2018-01-21 14:50:24 +01:00
parent 1e8aa209b1
commit 48d557b242
18 changed files with 65 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mail_templates/password_reset.ejs
View File

@@ -1,6 +1,6 @@
<%if (format === 'text') { %>
Hi <%= user.displayName || user.username || user.alternateEmail || user.email %>,
Hi <%= user.displayName || user.username || user.email %>,
Someone, hopefully you, has requested your account's password
be reset. If you did not request this reset, please ignore this message.
@@ -18,7 +18,7 @@ Powered by https://cloudron.io
<img src="<%= cloudronAvatarUrl %>" width="128px" height="128px"/>
<h3>Hi <%= user.displayName || user.username || user.alternateEmail || user.email %>,</h3>
<h3>Hi <%= user.displayName || user.username || user.email %>,</h3>
<p>
Someone, hopefully you, has requested your account's password be reset.<br/>

4
src/mail_templates/user_added.ejs
View File

@@ -2,7 +2,7 @@
Dear <%= cloudronName %> Admin,
A new user with email <%= user.alternateEmail || user.email %> was added to <%= cloudronName %>.
A new user with email <%= user.email %> was added to <%= cloudronName %>.
<% if (inviteLink) { %>
As requested, this user has not been sent an invitation email.
@@ -24,7 +24,7 @@ Powered by https://cloudron.io
<h3>Dear <%= cloudronName %> Admin,</h3>
<p>
A new user with email <%= user.alternateEmail || user.email %> was added to <%= cloudronName %>.
A new user with email <%= user.email %> was added to <%= cloudronName %>.
</p>
<% if (inviteLink) { %>

2
src/mail_templates/user_event.ejs
View File

@@ -2,7 +2,7 @@
Dear Cloudron Admin,
User <%= user.username || user.alternateEmail || user.email %> <%= event %>.
User <%= user.username || user.email %> <%= event %>.
Powered by https://cloudron.io

4
src/mail_templates/welcome_user.ejs
View File

@@ -1,6 +1,6 @@
<%if (format === 'text') { %>
Dear <%= user.displayName || user.username || user.alternateEmail || user.email %>,
Dear <%= user.displayName || user.username || user.email %>,
Welcome to <%= cloudronName %>!
@@ -20,7 +20,7 @@ Powered by https://cloudron.io
<img src="<%= cloudronAvatarUrl %>" width="128px" height="128px"/>
<h3>Hi <%= user.displayName || user.username || user.alternateEmail || user.email %>,</h3>
<h3>Hi <%= user.displayName || user.username || user.email %>,</h3>
<h2>Welcome to <%= cloudronName %>!</h2>