-
Notifications
You must be signed in to change notification settings - Fork 185
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
MPP-3901: update content for disable-mask email
- Loading branch information
1 parent
2e41ce4
commit 9fdb42d
Showing
3 changed files
with
112 additions
and
58 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,32 +1,71 @@ | ||
| {% comment %} | ||
| Note that Django only loads strings from some Fluent files. | ||
| See privaterelay/ftl_bundles.py. | ||
| {% endcomment %} | ||
| {% load ftl %} | ||
| {% load email_extras %} | ||
| {% withftl bundle='privaterelay.ftl_bundles.main' language=language %} | ||
|
|
||
| {% include "emails/direct_email_header.html" %} | ||
|
|
||
| <table role="presentation" border="0" cellpadding="0" cellspacing="10px" style="padding: 60px 30px 120px 30px;" align="center"> | ||
| <tr> | ||
| <td style="max-width:850px; padding-top: 0px; padding-bottom: 0px; text-align: center;"> | ||
| {% with mask|striptags|urlencode as mask_url %} | ||
| <h2 style="font-family: inter medium, Arial, system-ui, sans-serif;"> | ||
| <img width="18" src="{{ SITE_ORIGIN }}/static/images/email-images/warning.png" style="margin: 0 5px;" alt="warning icon"/> | ||
| {% ftlmsg 'relay-disabled-your-mask' %} | ||
| </h2> | ||
| <p style="line-height: 200%; margin-bottom: 30px; padding: 20px 60px 20px 60px"> | ||
| {% ftlmsg 'relay-received-spam-complaint-html' mask=mask %} {% ftlmsg 'relay-disabled-your-mask-detail-html' mask=mask %} | ||
| </p> | ||
| <a href="{{ SITE_ORIGIN }}/accounts/profile/#{{ mask_url }}"> | ||
| {% ftlmsg 're-enable-your-mask' %} | ||
| </a> | ||
| {% endwith %} | ||
| </td> | ||
| </tr> | ||
| </table> | ||
|
|
||
| {% include "emails/direct_email_footer.html" %} | ||
|
|
||
| {% endwithftl %} | ||
| {% comment %} | ||
| Note that Django only loads strings from some Fluent files. | ||
| See privaterelay/ftl_bundles.py. | ||
| {% endcomment %} | ||
| {% load ftl %} | ||
| {% load email_extras %} | ||
| {% withftl bundle='privaterelay.ftl_bundles.main' language=language %} | ||
|
|
||
| {% include "emails/direct_email_header.html" %} | ||
|
|
||
| <style> | ||
| .button { | ||
| box-sizing: border-box; | ||
| padding: 15px 25px; | ||
| display: inline-block; | ||
| font-family: 'metropolis medium', system-ui, sans-serif; | ||
| text-decoration: none; | ||
| -webkit-text-size-adjust: none; | ||
| text-align: center; | ||
| color: #FFFFFF; | ||
| background-color: #0060df; | ||
| border-radius: 4px; | ||
| -webkit-border-radius: 4px; | ||
| -moz-border-radius: 4px; | ||
| width: auto; | ||
| max-width: 100%; | ||
| overflow-wrap: break-word; | ||
| word-break: break-word; | ||
| word-wrap: break-word; | ||
| font-size: 16px; | ||
| } | ||
| </style> | ||
| <table role="presentation" border="0" cellpadding="0" cellspacing="10px" style="padding: 30px;" align="center"> | ||
| {% with mask|striptags|urlencode as mask_for_url %} | ||
| {% with "/accounts/profile/#"|add:mask_for_url as mask_url%} | ||
| <tr> | ||
| <td style="max-width:850px; padding-top: 0px; padding-bottom: 0px; text-align: center;"> | ||
| <h2 style="font-family: inter medium, Arial, system-ui, sans-serif;"> | ||
| <img width="18" src="{{ SITE_ORIGIN }}/static/images/email-images/warning.png" style="margin: 0 5px;" alt="warning icon"/> | ||
| {% ftlmsg 'reactivate-your-mask' %} | ||
| </h2> | ||
| </td> | ||
| </tr> | ||
| <tr> | ||
| <td style="max-width:850px; padding-top: 0px; padding-bottom: 0px;"> | ||
| <p style="line-height: 120%; padding: 10px"> | ||
| {% ftlmsg 'relay-received-spam-complaint-and-deactivated-mask-html' mask=mask %} {% ftlmsg 'relay-disabled-your-mask-detail-html' mask=mask %} | ||
| </p> | ||
| <p style="line-height: 120%; padding: 10px"> | ||
| {% ftlmsg 'reactivate-mask-detail-html' mask_url=mask_url %} | ||
| </p> | ||
| <p style="line-height: 120%; padding: 10px"> | ||
| {% ftlmsg 'learn-about-blocking-html' learn_more_url='https://support.mozilla.org/kb/disable-email-forwarding-stop-receiving-emails-sent-through-masks' %} | ||
| </p> | ||
| </td> | ||
| </tr> | ||
| <tr> | ||
| <td style="max-width:850px; padding-top: 20px; padding-bottom: 20px; text-align: center;"> | ||
| <a href="{{ mask_url }}" | ||
| target="_blank" class="button" style="color: #FFFFFF;" rel="noreferrer"> | ||
| {% ftlmsg 'reactivate-your-mask' %} | ||
| </a> | ||
| </td> | ||
| </tr> | ||
| {% endwith %} | ||
| {% endwith %} | ||
| </table> | ||
|
|
||
| {% include "emails/direct_email_footer.html" %} | ||
|
|
||
| {% endwithftl %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,13 @@ | ||
| {% load ftl %} | ||
| {% load email_extras %} | ||
| {% withftl bundle='privaterelay.ftl_bundles.main' language=language %} | ||
| {% ftlmsg 'relay-disabled-your-mask' %} | ||
| {% ftlmsg 'relay-deactivated-your-mask' %} | ||
|
|
||
| {% ftlmsg 'relay-received-spam-complaint' mask=mask %} {% ftlmsg 'relay-disabled-your-mask-detail' mask=mask %} | ||
| {% ftlmsg 'relay-received-spam-complaint-and-deactivated-mask' mask=mask %} | ||
| {% with mask|striptags|urlencode as mask_url %} | ||
| {% ftlmsg 're-enable-your-mask' %} | ||
| {% ftlmsg 'reactivate-mask-detail' %} | ||
| {{ SITE_ORIGIN }}/accounts/profile/#{{ mask_url }} | ||
| {% endwith %} | ||
|
|
||
| {% ftlmsg 'learn-about-blocking' learn_more_url='https://support.mozilla.org/kb/disable-email-forwarding-stop-receiving-emails-sent-through-masks' %} | ||
| {% endwithftl %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,36 @@ | ||
| # This Source Code Form is subject to the terms of the Mozilla Public | ||
| # License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| # file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||
|
|
||
| # This is the Django equivalent of frontend/pendingTranslations.ftl | ||
|
|
||
| ## Email sent to users when Relay disables their mask after the user marks a forwarded | ||
| ## email as spam. | ||
|
|
||
| relay-disabled-your-mask = { -brand-name-firefox-relay } has disabled one of your email masks. | ||
| # Variables | ||
| # $mask (string) - the Relay email mask that sent a spam complaint | ||
| relay-received-spam-complaint-html = { -brand-name-firefox-relay } received a spam complaint for an email sent to <strong>{ $mask }</strong>. This usually happens if you or your email provider mark an email as spam. | ||
| # Variables | ||
| # $mask (string) - the Relay email mask that sent a spam complaint | ||
| relay-received-spam-complaint = { -brand-name-firefox-relay } received a spam complaint for an email sent to { $mask }. This usually happens if you or your email provider mark an email as spam. | ||
| # Variables | ||
| # $mask (string) - the Relay email mask that sent a spam complaint | ||
| relay-disabled-your-mask-detail-html = To prevent further spam, { -brand-name-firefox-relay } has disabled your <strong>{ $mask }</strong> mask. | ||
| # Variables | ||
| # $mask (string) - the Relay email mask that sent a spam complaint | ||
| relay-disabled-your-mask-detail = To prevent further spam, { -brand-name-firefox-relay } has disabled your { $mask } mask. | ||
| re-enable-your-mask = Visit your { -brand-name-firefox-relay } dashboard to re-enable this mask. | ||
| # This Source Code Form is subject to the terms of the Mozilla Public | ||
| # License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| # file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||
|
|
||
| # This is the Django equivalent of frontend/pendingTranslations.ftl | ||
|
|
||
| ## Email sent to users when Relay deactivates their mask after the user marks a forwarded | ||
| ## email as spam. | ||
|
|
||
| relay-deactivated-your-mask = { -brand-name-firefox-relay } has deactivated one of your email masks. | ||
| reactivate-your-mask = Reactivate your email mask | ||
| # Variables | ||
| # $mask (string) - the Relay email mask that sent a spam complaint | ||
| relay-received-spam-complaint-and-deactivated-mask-html = An email from your mask address, { $mask }, was marked as spam. When this happens, { -brand-name-firefox-relay } deactivates the mask and stops forwarding emails. | ||
| # Variables | ||
| # $mask (string) - the Relay email mask that sent a spam complaint | ||
| relay-received-spam-complaint-and-deactivated-mask = An email from your mask address, { $mask }, was marked as spam. When this happens, { -brand-name-firefox-relay } deactivates the mask and stops forwarding emails. | ||
| # Variables | ||
| # $mask_url (string) - url takes user to Relay dashboard with mask selected | ||
| reactivate-mask-detail-html = To reactivate your mask, remove email blocking on <a href="{ $mask_url }">your { -brand-name-firefox-relay } dashboard</a>. | ||
| reactivate-mask-detail = To reactivate your mask, remove email blocking on your { -brand-name-firefox-relay } dashboard. | ||
| # Variables | ||
| # $learn_more_url (string) - support.mozilla.org page with more information | ||
| learn-about-blocking-html = <a href="{ $learn_more_url }">Learn about blocking and email forwarding</a> | ||
| # Variables | ||
| # $learn_more_url (string) - support.mozilla.org page with more information | ||
| learn-about-blocking = Learn about blocking and email forwarding at { $learn_more_url } | ||
| re-enable-your-mask = Visit your { -brand-name-firefox-relay } dashboard to re-enable this mask. |