diff --git a/pyproject.toml b/pyproject.toml index 5eec950e..71579576 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,7 +21,7 @@ exclude = ''' [tool.djlint] indent = 2 profile = "jinja" -blank_line_after_tag = "if,for,include,load,extends,block" +blank_line_after_tag = "if,for,include,load,extends,block,endcall" # H006: Images should have a height attribute # H013: Images should have an alt attribute diff --git a/templates/emails/com/newsletter/mobile-darkmode.html b/templates/emails/com/newsletter/mobile-darkmode.html index c3095479..6f57cd10 100644 --- a/templates/emails/com/newsletter/mobile-darkmode.html +++ b/templates/emails/com/newsletter/mobile-darkmode.html @@ -10,6 +10,7 @@ Please find below some of our latest news.
{% endcall %} + {% call text() %} 1) Mobile apps
@@ -35,6 +36,7 @@ With the release of the mobile apps, SimpleLogin now covers most major platforms The code is of course open-source and available on our Github {% endcall %} + {% call text() %} 2) Dark mode
@@ -46,6 +48,7 @@ You have asked for it and now the dark mode is finally available, kudos to Dung
You can finally enjoy using SimpleLogin in the dark. {% endcall %} + {% call text() %} 3) Alias name, new UI, security page, new policy privacy
@@ -68,6 +71,7 @@ is also rewritten from scratch: nothing changes about your data protection but the page is more clear and detailed now. {% endcall %} + {% call text() %} 4) Facebook, Google, Github login deprecation
@@ -89,18 +93,21 @@ If you happen to use one of these social login options, please create a password
You can still sign in using these social login until 2020-05-31. After this date, they will be removed. {% endcall %} + {% call text() %} 5) WebAuthn (Beta)
Thanks to Raymond, a user of SimpleLogin, the WebAuthn is now available in Beta. Please reply to this email if you want to try this out. {% endcall %} + {% call text() %}
On behalf of the team, I want to say thank you to all users who have helped to improve SimpleLogin code and even contribute important features. That means a lot to us as SimpleLogin is after all an open-source project. {% endcall %} + {% call text() %} That's all for today. If you want to follow all our latest features, you can follow our Twitter @@ -112,11 +119,13 @@ or subscribe to our
Now back to coding :). {% endcall %} + {% call text() %} Best,
Son. {% endcall %} + {% endblock %} {% block footer %} diff --git a/templates/emails/com/onboarding/browser-extension.html b/templates/emails/com/onboarding/browser-extension.html index 7bd39bf1..9a435493 100644 --- a/templates/emails/com/onboarding/browser-extension.html +++ b/templates/emails/com/onboarding/browser-extension.html @@ -5,6 +5,7 @@ {% call text() %}

Download SimpleLogin browser extensions and mobile apps to create aliases on-the-fly.

{% endcall %} + {% call text() %} If you want to quickly create aliases without going to SimpleLogin website, you can do that with SimpleLogin Chrome @@ -14,6 +15,7 @@ and Safari extension. {% endcall %} + {% call text() %} You can also manage your aliases using SimpleLogin Android App @@ -21,6 +23,7 @@ or iOS app . {% endcall %} + Available Everywhere diff --git a/templates/emails/com/onboarding/mailbox.html b/templates/emails/com/onboarding/mailbox.html index 8a997858..3a81d169 100644 --- a/templates/emails/com/onboarding/mailbox.html +++ b/templates/emails/com/onboarding/mailbox.html @@ -5,10 +5,12 @@ {% call text() %}

Add other mailboxes to SimpleLogin.

{% endcall %} + {% call text() %} If you have several email inboxes, say Gmail and ProtonMail, you can add them into SimpleLogin as mailboxes. {% endcall %} + Multiple Mailboxes @@ -20,9 +22,11 @@ When creating an alias, you can choose the mailbox(es) that
2. The owning mailbox(es) can send emails from this alias. {% endcall %} + {% call text() %} Please note that adding additional mailboxes is only available in the Premium plan. {% endcall %} + {{ render_button("Create mailbox", URL ~ "/dashboard/mailbox") }} {{ raw_url(URL ~ "/dashboard/mailbox") }} {% endblock %} diff --git a/templates/emails/com/onboarding/pgp.html b/templates/emails/com/onboarding/pgp.html index 6b96092a..62e92d10 100644 --- a/templates/emails/com/onboarding/pgp.html +++ b/templates/emails/com/onboarding/pgp.html @@ -5,21 +5,25 @@ {% call text() %}

Secure your emails with PGP.

{% endcall %} + {% call text() %} If you use Gmail, Yahoo, Outlook, etc, you might want to use PGP (Pretty Good Privacy) to make sure your emails can't be read by these email providers. {% endcall %} + {% call text() %} Without PGP, emails are stored in plaintext leaving your email service able to read your emails. {% endcall %} + Without PGP {% call text() %} With PGP enabled, SimpleLogin encrypts your emails with your public key before forwarding to your mailbox. {% endcall %} + Without PGP diff --git a/templates/emails/com/onboarding/send-from-alias.html b/templates/emails/com/onboarding/send-from-alias.html index 87778a5d..b8b0a70c 100644 --- a/templates/emails/com/onboarding/send-from-alias.html +++ b/templates/emails/com/onboarding/send-from-alias.html @@ -5,38 +5,45 @@ {% call text() %}

Send emails from your alias.

{% endcall %} + {% call text() %} If you want to reply to an email, just hit "Reply" and the response will come from your alias. Your personal email address stays hidden. {% endcall %} + {% call text() %} To send an email to a new contact, please follow the steps below. You can also watch this Youtube video that quickly walks you through the steps. {% endcall %} + {% call text() %} 1. Click the Contacts button on the alias you want to send emails from
{% endcall %} + {% call text() %} 2. Enter your contact email, this will create a reverse-alias for the contact.
{% endcall %} + {% call text() %} 3. Send the email to this reverse-alias instead of the contact email.
{% endcall %} + {% call text() %} And voilĂ , your contact will receive this email sent from your alias! Your real mailbox address will stay hidden. {% endcall %} + {% endblock %} {% block footer %} diff --git a/templates/emails/com/onboarding/welcome-proton-user.html b/templates/emails/com/onboarding/welcome-proton-user.html index 861c0518..12572e35 100644 --- a/templates/emails/com/onboarding/welcome-proton-user.html +++ b/templates/emails/com/onboarding/welcome-proton-user.html @@ -7,15 +7,18 @@ {% call text() %} Welcome to SimpleLogin, a service developed by Proton to protect your email address! {% endcall %} + {% call text() %} This is the first email you receive via your first alias {{ to_address }} {% endcall %} + {% call text() %} This alias is automatically created when you use SimpleLogin for the first time. Emails sent to it are forwarded to your Proton mailbox. If you want to reply to an email, just hit "Reply" and the response will come from your alias. Your personal email address stays hidden. {% endcall %} + {% call text() %} To create new aliases, use the SimpleLogin browser extension (recommended) or web dashboard. SimpleLogin is available on @@ -27,6 +30,7 @@ and Edge {% endcall %} + {% call text() %} SimpleLogin is also available on Android @@ -34,9 +38,11 @@ and iOS so you can manage your aliases on the go. {% endcall %} + {% call text() %} Note, if you are a paying Proton Mail user, you automatically receive the premium version of SimpleLogin. {% endcall %} + {% call text() %} For any question, feedback or feature request, please join our GitHub forum @@ -47,9 +53,11 @@ or follow our Twitter . {% endcall %} + {% call text() %} Best,
SimpleLogin Team. {% endcall %} + {% endblock %} diff --git a/templates/emails/com/welcome.html b/templates/emails/com/welcome.html index 259b3617..1dae790f 100644 --- a/templates/emails/com/welcome.html +++ b/templates/emails/com/welcome.html @@ -18,6 +18,7 @@ {% call text() %} This is the first email you receive via your first alias {{ alias }}. {% endcall %} + {% call text() %} This alias is automatically created for receiving SimpleLogin news and tips.
@@ -27,6 +28,7 @@ disable it if you don't need this. {% endcall %} + {% endif %} {% call text() %} If you are using Firefox or a Chromium-browser like Chrome, Edge, Brave, you can @@ -36,10 +38,12 @@ or Chrome extension to create aliases in one click (like in the below gif 👇). {% endcall %} + {% call text() %} {% endcall %} + {% call text() %} SimpleLogin is also available on Android @@ -47,6 +51,7 @@ and iOS so you can manage your aliases on the go. {% endcall %} + {% if user.in_trial() and user.trial_end %} {% call text() %} @@ -58,10 +63,12 @@ so you can manage your aliases on the go. continue to work normally even if you don't upgrade.
{% endcall %} + {% call text() %} Please note that you can't create more than 15 aliases during the trial period.
{% endcall %} + {% endif %} {% call text() %} For any question, feedback or feature request, please join our @@ -73,4 +80,5 @@ or follow our Twitter . {% endcall %} + {% endblock %} diff --git a/templates/emails/transactional/account-delete.html b/templates/emails/transactional/account-delete.html index 7f8b75bd..c9c91330 100644 --- a/templates/emails/transactional/account-delete.html +++ b/templates/emails/transactional/account-delete.html @@ -5,9 +5,11 @@ {% call text() %}

Your SimpleLogin account has been deleted successfully.

{% endcall %} + {% call text() %} Thank you for having used SimpleLogin. {% endcall %} + {{ render_text('Best,
SimpleLogin Team.') }} diff --git a/templates/emails/transactional/alias-transferred.html b/templates/emails/transactional/alias-transferred.html index 7bb4f208..a497f8cd 100644 --- a/templates/emails/transactional/alias-transferred.html +++ b/templates/emails/transactional/alias-transferred.html @@ -5,12 +5,15 @@ {% call text() %}

{{ alias.email }} has been transferred.

{% endcall %} + {% call text() %} Your (previously) alias {{ alias.email }} has been received by another user. {% endcall %} + {% call text() %} Best,
SimpleLogin Team. {% endcall %} + {% endblock %} diff --git a/templates/emails/transactional/bounce/automatic-disable-alias.html b/templates/emails/transactional/bounce/automatic-disable-alias.html index 575747ec..677529de 100644 --- a/templates/emails/transactional/bounce/automatic-disable-alias.html +++ b/templates/emails/transactional/bounce/automatic-disable-alias.html @@ -5,14 +5,17 @@ {% call text() %}

{{ alias.email }} is disabled

{% endcall %} + {% call text() %} There are several emails sent to your alias {{ alias.email }} that have been bounced by your mailbox {{ mailbox_email }}. {% endcall %} + {{ render_button("View the refused email", refused_email_url) }} {% call text() %} As security measure, we have disabled the alias. {% endcall %} + {{ render_text('Please let us know if you have any question.') }} {{ render_text('Thanks,
diff --git a/templates/emails/transactional/bounce/bounce-email-reply-phase.html b/templates/emails/transactional/bounce/bounce-email-reply-phase.html index 1be6c4be..c2f8160c 100644 --- a/templates/emails/transactional/bounce/bounce-email-reply-phase.html +++ b/templates/emails/transactional/bounce/bounce-email-reply-phase.html @@ -5,6 +5,7 @@ {% call text() %}

Email cannot be sent to {{ contact.email }} from your alias {{ alias.email }}

{% endcall %} + {% call text() %} This might mean {{ contact.email }} {% endcall %} + {{ render_button("View the original email", refused_email_url) }} {% call text() %} This email is automatically deleted in 7 days. {% endcall %} + {% call text() %} Best,
SimpleLogin Team. {% endcall %} + {% endblock %} diff --git a/templates/emails/transactional/bounce/bounced-email.html b/templates/emails/transactional/bounce/bounced-email.html index 7dd3a766..04ff0b3c 100644 --- a/templates/emails/transactional/bounce/bounced-email.html +++ b/templates/emails/transactional/bounce/bounced-email.html @@ -8,9 +8,11 @@ {{ mailbox_email }} {% endcall %} + {% call text() %} This is usually because your mailbox service thinks the email is spam. {% endcall %} + {{ render_button("View the bounced email", refused_email_url) }} {{ render_text('The email is automatically deleted in 7 days.') }} {% call text() %} @@ -35,6 +37,7 @@ Please consider the following options:
Please note that the alias can be automatically disabled if too many emails sent to it are bounced. {% endcall %} + {{ render_text('Thanks,
SimpleLogin Team.') }} diff --git a/templates/emails/transactional/cannot-create-alias-directory-disabled.html b/templates/emails/transactional/cannot-create-alias-directory-disabled.html index e8689690..9e87d446 100644 --- a/templates/emails/transactional/cannot-create-alias-directory-disabled.html +++ b/templates/emails/transactional/cannot-create-alias-directory-disabled.html @@ -5,15 +5,19 @@ {% call text() %}

Cannot create {{ alias }} on-the-fly

{% endcall %} + {% call text() %} An email has been sent to the alias {{ alias }} that would be created automatically as you own the directory {{ directory }} {% endcall %} + {% call text() %} As on-the-fly alias creation is disabled on this directory, the alias isn't created. {% endcall %} + {% call text() %} If you aren't aware of this alias, that probably means someone has discovered about your directory and is abusing it. {% endcall %} + {{ render_text('Thanks,
SimpleLogin Team.') }} diff --git a/templates/emails/transactional/cannot-create-alias-directory.html b/templates/emails/transactional/cannot-create-alias-directory.html index 6724f80c..7705d09e 100644 --- a/templates/emails/transactional/cannot-create-alias-directory.html +++ b/templates/emails/transactional/cannot-create-alias-directory.html @@ -5,6 +5,7 @@ {% call text() %}

Cannot create alias {{ alias }} on-the-fly

{% endcall %} + {{ render_text("An email has been sent to the alias " + alias + " that would be created automatically as you own the directory " + directory + ".") }} {{ render_text("However you have reached the alias limit in your current plan, this creation cannot happen.") }} {{ render_text('Please upgrade to premium plan in order to use this feature.') }} diff --git a/templates/emails/transactional/cannot-create-alias-domain.html b/templates/emails/transactional/cannot-create-alias-domain.html index 10c61319..e3374559 100644 --- a/templates/emails/transactional/cannot-create-alias-domain.html +++ b/templates/emails/transactional/cannot-create-alias-domain.html @@ -5,6 +5,7 @@ {% call text() %}

Cannot create {{ alias }} on-the-fly

{% endcall %} + {{ render_text("An email has been sent to the alias " + alias + " that would be created automatically as you own the domain " + domain + ".") }} {{ render_text("However you have reached the alias limit in your current plan, this creation cannot happen.") }} {{ render_text('Please upgrade to premium plan in order to use this feature.') }} diff --git a/templates/emails/transactional/coinbase/extend-subscription.html b/templates/emails/transactional/coinbase/extend-subscription.html index d4bf806c..2c3e756d 100644 --- a/templates/emails/transactional/coinbase/extend-subscription.html +++ b/templates/emails/transactional/coinbase/extend-subscription.html @@ -5,15 +5,18 @@ {% call text() %}

Your subscription has been extended!

{% endcall %} + {% call text() %} Your payment with cryptocurrency has been successfully processed.
Your subscription has been extended to {{ coinbase_subscription.end_at.format("YYYY-MM-DD") }} {% endcall %} + {% call text() %} Thank you a lot for your support! {% endcall %} + {{ render_text('Best,
SimpleLogin Team.') }} diff --git a/templates/emails/transactional/coinbase/new-subscription.html b/templates/emails/transactional/coinbase/new-subscription.html index bb70e6b2..2f2b8dfe 100644 --- a/templates/emails/transactional/coinbase/new-subscription.html +++ b/templates/emails/transactional/coinbase/new-subscription.html @@ -5,15 +5,18 @@ {% call text() %}

Your account has been upgraded!

{% endcall %} + {% call text() %} Your payment with cryptocurrency has been successfully processed.
Your account has been upgraded to the premium plan until {{ coinbase_subscription.end_at.format("YYYY-MM-DD") }} {% endcall %} + {% call text() %} Thank you a lot for your support! {% endcall %} + {{ render_text('Best,
SimpleLogin Team.') }} diff --git a/templates/emails/transactional/coinbase/reminder-subscription.html b/templates/emails/transactional/coinbase/reminder-subscription.html index 529e6d33..7fe06111 100644 --- a/templates/emails/transactional/coinbase/reminder-subscription.html +++ b/templates/emails/transactional/coinbase/reminder-subscription.html @@ -5,10 +5,12 @@ {% call text() %}

Your subscription is ending soon.

{% endcall %} + {% call text() %} Your subscription ends on {{ coinbase_subscription.end_at.format("YYYY-MM-DD") }} {% endcall %} + {{ render_button("Extend your subscription", extend_subscription_url) }} {{ render_text('Best,
diff --git a/templates/emails/transactional/cycle-email.html b/templates/emails/transactional/cycle-email.html index 5ad957c3..e761f077 100644 --- a/templates/emails/transactional/cycle-email.html +++ b/templates/emails/transactional/cycle-email.html @@ -8,15 +8,18 @@ {{ from_addr }}. {% endcall %} + {% call text() %} SimpleLogin doesn't send this email back to your mailbox as it would be refused or hidden anyway by your email service.
So no worries, there's nothing you need to do :). {% endcall %} + {{ render_button("View the email", refused_email_url) }} {% call text() %} The email is automatically deleted in 7 days. {% endcall %} + {{ render_text('Thanks,
SimpleLogin Team.') }} diff --git a/templates/emails/transactional/disable-mailbox-warning.html b/templates/emails/transactional/disable-mailbox-warning.html index 3ebd46f2..984d7a07 100644 --- a/templates/emails/transactional/disable-mailbox-warning.html +++ b/templates/emails/transactional/disable-mailbox-warning.html @@ -5,20 +5,25 @@ {% call text() %}

Issues with {{ mailbox.email }}.

{% endcall %} + {% call text() %} We have detected that your mailbox can't reliably receive emails from SimpleLogin for a consecutive period of time.
The mailbox will be disabled in 5 days if the problem isn't solved by then. {% endcall %} + {% call text() %} Please note that a mailbox can't be a disposable or forwarding email address. {% endcall %} + {% call text() %} If you have any question, you can reach out to us by replying to this email. {% endcall %} + {% call text() %} Best,
SimpleLogin Team. {% endcall %} + {% endblock %} diff --git a/templates/emails/transactional/disable-mailbox.html b/templates/emails/transactional/disable-mailbox.html index ff6fb18e..8c78bf61 100644 --- a/templates/emails/transactional/disable-mailbox.html +++ b/templates/emails/transactional/disable-mailbox.html @@ -5,20 +5,25 @@ {% call text() %}

{{ mailbox.email }} is disabled.

{% endcall %} + {% call text() %} We have detected that your mailbox can't reliably receive emails from SimpleLogin for a consecutive period of time.
The mailbox has been therefore disabled. {% endcall %} + {% call text() %} Please note that a mailbox can't be a disposable or forwarding email address. {% endcall %} + {% call text() %} If you have any question, you can reach out to us by replying to this email. {% endcall %} + {% call text() %} Best,
SimpleLogin Team. {% endcall %} + {% endblock %} diff --git a/templates/emails/transactional/hibp-new-breaches.html b/templates/emails/transactional/hibp-new-breaches.html index 98db9c1c..6c386441 100644 --- a/templates/emails/transactional/hibp-new-breaches.html +++ b/templates/emails/transactional/hibp-new-breaches.html @@ -5,6 +5,7 @@ {% call text() %}

{{ breached_aliases|count }} of your aliases are found in data breaches.

{% endcall %} +
    {%- for alias in breached_aliases[:10] %}
  1. @@ -23,6 +24,7 @@ {% if breaches|length > 4 %}And {{ breaches|length - 4 }} more data breaches...{% endif %} {% endcall %} +
    2. {%- endfor %}
@@ -31,12 +33,14 @@ {% call text() %} And {{ breached_aliases|length - 10 }} more aliases... {% endcall %} + {% endif %} {% call text() %} For more information, check HaveIBeenPwned.com . {% endcall %} + {{ render_text('Best,
SimpleLogin Team.') }} diff --git a/templates/emails/transactional/mailbox-invalid.html b/templates/emails/transactional/mailbox-invalid.html index b939e561..9ab9a03c 100644 --- a/templates/emails/transactional/mailbox-invalid.html +++ b/templates/emails/transactional/mailbox-invalid.html @@ -7,13 +7,16 @@ Your mailbox {{ mailbox.email }} and alias {{ alias.email }} cannot have the same domain. {% endcall %} + {% call text() %} The alias domain should point to SimpleLogin servers so emails sent to it are forwarded by SimpleLogin. {% endcall %} + {% call text() %} The mailbox domain should be your "final" email address that can receive emails from SimpleLogin and cannot point to SimpleLogin. {% endcall %} + {% call text() %} Please either:
@@ -22,6 +25,7 @@ Please either:
  • remove {{ alias.email }} domain from your custom domains
    • {% endcall %} + {% call text() %} Feel free reply to this email if you have any question.
    @@ -29,4 +33,5 @@ Best,
    SimpleLogin team. {% endcall %} + {% endblock %} diff --git a/templates/emails/transactional/manual-subscription-end.html b/templates/emails/transactional/manual-subscription-end.html index a2b18acc..39610e97 100644 --- a/templates/emails/transactional/manual-subscription-end.html +++ b/templates/emails/transactional/manual-subscription-end.html @@ -7,11 +7,13 @@ Your subscription will end on {{ manual_sub.end_at.format("YYYY-MM-DD") }} {% endcall %} + {% call text() %} Please contact us at hi@simplelogin.io to renew your subscription. {% endcall %} + {{ render_text('Thanks,
    SimpleLogin Team.') }} diff --git a/templates/emails/transactional/message-quarantine-dmarc.html b/templates/emails/transactional/message-quarantine-dmarc.html index ee5a13ed..e4e896da 100644 --- a/templates/emails/transactional/message-quarantine-dmarc.html +++ b/templates/emails/transactional/message-quarantine-dmarc.html @@ -5,18 +5,22 @@ {% call text() %}

    An email from {{ from_header }} to {{ alias.email }} is put into Quarantine

    {% endcall %} + {% call text() %} An email from {{ from_header }} to {{ alias.email }} is put into Quarantine as it fails anti-phishing measure check. {% endcall %} + {{ render_button("View the original email", refused_email_url) }} {% call text() %} This email is automatically deleted in 7 days. {% endcall %} + {% call text() %} Best,
    SimpleLogin Team. {% endcall %} + {% endblock %} diff --git a/templates/emails/transactional/provider-complaint-forward-phase.html b/templates/emails/transactional/provider-complaint-forward-phase.html index 8d0ae7db..46dc073f 100644 --- a/templates/emails/transactional/provider-complaint-forward-phase.html +++ b/templates/emails/transactional/provider-complaint-forward-phase.html @@ -5,29 +5,36 @@ {% call text() %} This is SimpleLogin team. {% endcall %} + {% call text() %} {{ provider }} has informed us about an email sent to {{ email }} that might have been considered as spam, either by you or by {{ provider }} spam filter. {% endcall %} + {% call text() %} Please note that explicitly marking a SimpleLogin's forwarded email as Spam affects SimpleLogin email delivery, has a negative effect for all users and is a violation of our terms and condition. {% endcall %} + {% call text() %} If somehow {{ provider }} considers a forwarded email as Spam, it helps us if you can move the email out of the Spam folder. You can also set up a filter to avoid this from happening in the future using this guide at https://simplelogin.io/docs/getting-started/troubleshooting/ {% endcall %} + {% call text() %} Please don't put our emails into the Spam folder. This can end up in your account being disabled on SimpleLogin. {% endcall %} + {% call text() %} Don't hesitate to get in touch with us if you need more information. {% endcall %} + {% call text() %} Best,
    SimpleLogin Team. {% endcall %} + {% endblock %} diff --git a/templates/emails/transactional/provider-complaint-to-user.html b/templates/emails/transactional/provider-complaint-to-user.html index 5614b148..3b301cee 100644 --- a/templates/emails/transactional/provider-complaint-to-user.html +++ b/templates/emails/transactional/provider-complaint-to-user.html @@ -5,26 +5,33 @@ {% call text() %} This is SimpleLogin team. {% endcall %} + {% call text() %} {{ provider }} has informed us about an email sent to {{ user.email }} that might have been marked as spam. {% endcall %} + {% call text() %} Please note that explicitly marking a SimpleLogin's forwarded email as Spam affects SimpleLogin email delivery, has a negative effect for all users and is a violation of our terms and condition. {% endcall %} + {% call text() %} If that’s the case, please disable the alias instead if you don't want to receive the emails sent to this alias. {% endcall %} + {% call text() %} If SimpleLogin isn’t useful for you, please know that you can simply delete your account on the Settings page. {% endcall %} + {% call text() %} Don't hesitate to get in touch with us if you need more information. {% endcall %} + {% call text() %} Best,
    SimpleLogin Team. {% endcall %} + {% endblock %} diff --git a/templates/emails/transactional/reply-error.html b/templates/emails/transactional/reply-error.html index a52acb39..e347f396 100644 --- a/templates/emails/transactional/reply-error.html +++ b/templates/emails/transactional/reply-error.html @@ -6,15 +6,19 @@ {% call text() %} Your email cannot be sent to {{ contact.email }} from your alias {{ alias.email }}. {% endcall %} + {% call text() %} Can you please verify {{ contact.email }} is a valid address? {% endcall %} + {% call text() %} Usually this is because the DNS record of {{ contact_domain }} does not exist. {% endcall %} + {% call text() %} You can check its DNS record on any DNS checker websites, for example https://mxtoolbox.com/SuperTool.aspx {% endcall %} + {% call text() %} Please let us know if you have any question.
    @@ -22,4 +26,5 @@ Best,
    SimpleLogin team. {% endcall %} + {% endblock %} diff --git a/templates/emails/transactional/reply-must-use-personal-email.html b/templates/emails/transactional/reply-must-use-personal-email.html index a7b1195d..4464aa7b 100644 --- a/templates/emails/transactional/reply-must-use-personal-email.html +++ b/templates/emails/transactional/reply-must-use-personal-email.html @@ -7,21 +7,26 @@ An attempt to send an email from your alias {{ alias.email }} using {{ sender }} is blocked. {% endcall %} + {% call text() %} As a measure to protect against email spoofing, we have blocked an attempt to send an email from your alias {{ alias.email }} using {{ sender }}. {% endcall %} + {% call text() %} Please note that sending from this alias only works from alias's owning mailboxes, that are {{ mailbox_emails|join(", ") }} {% endcall %} + {% call text() %} If {{ sender }} can indeed send emails from your alias, you can add it to the allow list: {% endcall %} + {{ render_button("Allow " + sender, authorize_address_link) }} {% call text() %} Best,
    SimpleLogin Team. {% endcall %} + {{ raw_url(authorize_address_link) }} {% endblock %} diff --git a/templates/emails/transactional/spam-email-reply-phase.html b/templates/emails/transactional/spam-email-reply-phase.html index 2abe2ebf..bb69f8c9 100644 --- a/templates/emails/transactional/spam-email-reply-phase.html +++ b/templates/emails/transactional/spam-email-reply-phase.html @@ -5,19 +5,24 @@ {% call text() %}

    An email sent from your alias {{ alias.email }} to {{ website_email }} is detected as spam.

    {% endcall %} + {% call text() %} An email sent from your alias {{ alias.email }} to {{ website_email }} is detected as spam by our Spam Detection Engine (SpamAssassin). {% endcall %} + {% call text() %} In most of the cases, the email will be refused by your contact. {% endcall %} + {{ render_button("View the email", refused_email_url) }} {% call text() %} The email is automatically deleted in 7 days. {% endcall %} + {% call text() %} Please let us know if you have any question by replying to this email. {% endcall %} + {{ render_text('Thanks,
    SimpleLogin Team.') }} diff --git a/templates/emails/transactional/spam-email.html b/templates/emails/transactional/spam-email.html index 73cb0bc9..a47e1d41 100644 --- a/templates/emails/transactional/spam-email.html +++ b/templates/emails/transactional/spam-email.html @@ -5,19 +5,24 @@ {% call text() %}

    An email sent to your alias {{ alias.email }} from {{ website_email }} is detected as spam

    {% endcall %} + {% call text() %} An email sent to your alias {{ alias.email }} from {{ website_email }} is detected as spam by our Spam Detection Engine (SpamAssassin). {% endcall %} + {% call text() %} In most of the cases, the email will be refused by your email provider. {% endcall %} + {{ render_button("View the email", refused_email_url) }} {% call text() %} The email is automatically deleted in 7 days. {% endcall %} + {% call text() %} Your alias {{ alias.email }} is probably in the hands of a spammer now. In this case, you should disable or delete the alias immediately. {% endcall %} + {{ render_button("Disable alias", disable_alias_link) }} {{ render_text('Please let us know if you have any question by replying to this email.') }} {{ render_text('Thanks, diff --git a/templates/emails/transactional/spf-fail.html b/templates/emails/transactional/spf-fail.html index 1450e4e2..ca0b6739 100644 --- a/templates/emails/transactional/spf-fail.html +++ b/templates/emails/transactional/spf-fail.html @@ -7,11 +7,13 @@ Attempt to send an email from your alias {{ alias }} from an unknown IP address {% endcall %} + {% call text() %} We have recorded an attempt to send the following email from your alias {{ alias }} from an unknown IP address {{ ip }}. {% endcall %} + {% call text() %} - From: {{ alias }}
    @@ -21,16 +23,20 @@ address
    - Time: {{ time.humanize() }} {% endcall %} + {% call text() %} To prevent email-spoofing, SimpleLogin enforces the SPF (Sender Policy Framework). Emails sent from an IP address that is unknown by your email service are refused by default. {% endcall %} + {% call text() %} However you can turn off this option by going to {{ mailbox_url }}. {% endcall %} + {% call text() %} Please only turn this protection off this if you know what you're doing :). {% endcall %} + {{ render_text('Thanks,
    SimpleLogin Team.') }} diff --git a/templates/emails/transactional/spoof-reply.html b/templates/emails/transactional/spoof-reply.html index bd26af3a..fc0553f4 100644 --- a/templates/emails/transactional/spoof-reply.html +++ b/templates/emails/transactional/spoof-reply.html @@ -8,13 +8,16 @@ {{ sender }} has been blocked. {% endcall %} + {% call text() %} To protect against email spoofing, only your mailbox can send emails on behalf of your alias. SimpleLogin also refuses emails that claim to come from your mailbox but fail DMARC. {% endcall %} + {% call text() %} Best,
    SimpleLogin Team. {% endcall %} + {% endblock %} diff --git a/templates/emails/transactional/subscription-end.html b/templates/emails/transactional/subscription-end.html index 9c17731e..deccfb53 100644 --- a/templates/emails/transactional/subscription-end.html +++ b/templates/emails/transactional/subscription-end.html @@ -9,10 +9,12 @@ {% call text() %} - You cannot create new aliases if you exceed the free plan limit, i.e. have more than {{ MAX_NB_EMAIL_FREE_PLAN }} aliases. {% endcall %} + {% call text() %} - As features like catch-all or directory allow you to create aliases on-the-fly, those aliases cannot be automatically created if you have more than {{ MAX_NB_EMAIL_FREE_PLAN }} aliases. {% endcall %} + {{ render_text("- You cannot add new domain or directory.") }} {{ render_text('You can upgrade today to continue using all these Premium features (and much more coming).') }} {{ render_button("Upgrade your account", URL ~ "/dashboard/pricing") }} diff --git a/templates/emails/transactional/trial-end.html b/templates/emails/transactional/trial-end.html index b343d105..3cf0170b 100644 --- a/templates/emails/transactional/trial-end.html +++ b/templates/emails/transactional/trial-end.html @@ -5,11 +5,13 @@ {% call text() %}

    Your trial will end {{ user.trial_end.humanize() }}

    {% endcall %} + {{ render_text("When the trial ends:") }} {{ render_text("- All aliases/domains/directories you have created are kept and continue working normally.") }} {% call text() %} - You cannot create new aliases if you exceed the free plan limit, i.e. have more than {{ MAX_NB_EMAIL_FREE_PLAN }} aliases. {% endcall %} + {{ render_text("- You cannot add new domain or directory.") }} {{ render_text("- You cannot add new mailbox.") }} {{ render_text("- If you enable PGP Encryption, forwarded emails are not encrypted anymore.") }} diff --git a/templates/emails/transactional/unsubscribe-disable-alias.html b/templates/emails/transactional/unsubscribe-disable-alias.html index 8c187392..74682b73 100644 --- a/templates/emails/transactional/unsubscribe-disable-alias.html +++ b/templates/emails/transactional/unsubscribe-disable-alias.html @@ -5,14 +5,17 @@ {% call text() %}

    {{ alias }} has been disabled successfully.

    {% endcall %} + {% call text() %} The alias has been disabled thanks to the "One-click unsubscribe” provided by your mailbox service.
    When you click on this button on a forwarded email, the alias will be disabled automatically. {% endcall %} + {% call text() %} If this is a mistake, you can re-enable the alias on the dashboard. {% endcall %} + {{ render_button("Enable Alias", enable_alias_url) }} {{ render_text('Thanks,
    diff --git a/templates/emails/transactional/unsubscribe-newsletter.html b/templates/emails/transactional/unsubscribe-newsletter.html index ce01dfc2..41baafe8 100644 --- a/templates/emails/transactional/unsubscribe-newsletter.html +++ b/templates/emails/transactional/unsubscribe-newsletter.html @@ -5,13 +5,16 @@ {% call text() %}

    You have been unsubscribed from SimpleLogin newsletter.

    {% endcall %} + {% call text() %} We would love to know why do you want to unsubscribe from our communication. Please let us know by replying to this email. {% endcall %} + {% call text() %} Best,
    SimpleLogin Team. {% endcall %} + {% endblock %}