Fixed some missing footer_text partials and a few inconsistencies between plain text and html email templates

pull/3438/head
kennymc-c 2 years ago
parent 07099df41a
commit f850dbb310

@ -1,6 +1,4 @@
Master Password Has Been Changed Master Password Has Been Changed
<!----------------> <!---------------->
The master password for {{user_name}} has been changed by an administrator in your {{org_name}} organization. If you did not initiate this request, please reach out to your administrator immediately. The master password for {{user_name}} has been changed by an administrator in your {{org_name}} organization. If you did not initiate this request, please reach out to your administrator immediately.
{{> email/email_footer }}
===
Github: https://github.com/dani-garcia/vaultwarden

@ -3,6 +3,4 @@ Your Email Change
To finalize changing your email address enter the following code in web vault: {{token}} To finalize changing your email address enter the following code in web vault: {{token}}
If you did not try to change an email address, you can safely ignore this email. If you did not try to change an email address, you can safely ignore this email.
{{> email/email_footer }}
===
Github: https://github.com/dani-garcia/vaultwarden

@ -4,7 +4,7 @@ Delete Your Account
<table width="100%" cellpadding="0" cellspacing="0" style="margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;"> <table width="100%" cellpadding="0" cellspacing="0" style="margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;">
<tr style="margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;"> <tr style="margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;">
<td class="content-block" style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; margin: 0; -webkit-font-smoothing: antialiased; padding: 0 0 10px; -webkit-text-size-adjust: none; text-align: center;" valign="top" align="center"> <td class="content-block" style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; margin: 0; -webkit-font-smoothing: antialiased; padding: 0 0 10px; -webkit-text-size-adjust: none; text-align: center;" valign="top" align="center">
click the link below to delete your account. Click the link below to delete your account.
</td> </td>
</tr> </tr>
<tr style="margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;"> <tr style="margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;">

@ -1,5 +1,5 @@
Invitation to {{{org_name}}} accepted Invitation to {{{org_name}}} accepted
<!----------------> <!---------------->
Your invitation for *{{email}}* to join *{{org_name}}* was accepted. This email is to notify you that {{email}} has accepted your invitation to join {{org_name}}.
Please log in via {{url}} to the vaultwarden server and confirm them from the organization management page. Please log in via {{url}} to the vaultwarden server and confirm them from the organization management page.
{{> email/email_footer_text }} {{> email/email_footer_text }}

@ -1,5 +1,5 @@
Invitation to {{{org_name}}} confirmed Invitation to {{{org_name}}} confirmed
<!----------------> <!---------------->
Your invitation to join *{{org_name}}* was confirmed. This email is to notify you that you have been confirmed as a user of {{org_name}}.
It will now appear under the Organizations the next time you log in to the web vault at {{url}}. Any collections and logins being shared with you by this organization will now appear in your Vaultwarden vault at {{url}}.
{{> email/email_footer_text }} {{> email/email_footer_text }}

@ -4,6 +4,4 @@ You have been removed from organization *{{org_name}}* because your account does
You can enable Two-step Login in your account settings. You can enable Two-step Login in your account settings.
{{> email/email_footer }}
===
Github: https://github.com/dani-garcia/vaultwarden

@ -1,5 +1,4 @@
You have been removed from {{{org_name}}} You have been removed from {{{org_name}}}
<!----------------> <!---------------->
Your user account has been removed from the *{{org_name}}* organization because you are a part of another organization. The {{org_name}} organization has enabled a policy that prevents users from being a part of multiple organizations. Before you can re-join this organization you need to leave all other organizations or join with a different account. Your user account has been removed from the *{{org_name}}* organization because you are a part of another organization. The {{org_name}} organization has enabled a policy that prevents users from being a part of multiple organizations. Before you can re-join this organization you need to leave all other organizations or join with a different account.
=== {{> email/email_footer }}
Github: https://github.com/dani-garcia/vaultwarden

Loading…
Cancel
Save