From 81840e5ba581ae2d012a5a365e0a969ec8095375 Mon Sep 17 00:00:00 2001 From: Son Date: Mon, 25 Jan 2021 21:25:15 +0100 Subject: [PATCH] do not use user.name in email --- templates/emails/com/newsletter/mailbox.html | 2 +- templates/emails/com/newsletter/mailbox.txt | 2 +- templates/emails/com/newsletter/mobile-darkmode.html | 2 +- templates/emails/com/newsletter/mobile-darkmode.txt | 2 +- templates/emails/com/newsletter/pgp.html | 2 +- templates/emails/com/newsletter/pgp.txt | 2 +- templates/emails/com/newsletter/safari-extension.html | 2 +- templates/emails/com/newsletter/safari-extension.txt | 2 +- templates/emails/com/onboarding/browser-extension.txt | 2 +- templates/emails/com/onboarding/mailbox.txt | 2 +- templates/emails/com/onboarding/pgp.txt | 2 +- templates/emails/com/onboarding/send-from-alias.txt | 2 +- templates/emails/transactional/reply-error.html | 2 +- templates/emails/transactional/reply-error.txt | 2 +- templates/emails/transactional/subscription-end.html | 6 +----- templates/emails/transactional/subscription-end.txt | 2 +- .../emails/transactional/unsubscribe-disable-alias.html | 2 +- .../emails/transactional/unsubscribe-disable-alias.txt | 2 +- templates/emails/transactional/verify-mailbox-change.html | 2 +- templates/emails/transactional/verify-mailbox-change.txt | 2 +- templates/emails/transactional/verify-mailbox.html | 2 +- templates/emails/transactional/verify-mailbox.txt | 2 +- 22 files changed, 22 insertions(+), 26 deletions(-) diff --git a/templates/emails/com/newsletter/mailbox.html b/templates/emails/com/newsletter/mailbox.html index 416e6683..8a0a91f3 100644 --- a/templates/emails/com/newsletter/mailbox.html +++ b/templates/emails/com/newsletter/mailbox.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block content %} - {{ render_text("Hi " + user.name) }} + {{ render_text("Hi") }} {{ render_text("Our most requested feature is finally ready: you can now add several real email addresses into SimpleLogin and choose which one to use when creating aliases!") }} diff --git a/templates/emails/com/newsletter/mailbox.txt b/templates/emails/com/newsletter/mailbox.txt index be4b28e9..d06e43f7 100644 --- a/templates/emails/com/newsletter/mailbox.txt +++ b/templates/emails/com/newsletter/mailbox.txt @@ -2,7 +2,7 @@ This email is sent to {{ user.email }}. Unsubscribe from our emails on {{URL}}/dashboard/setting#notification ---------------- -Hi {{user.name}} +Hi Our most requested feature is finally ready: you can now add several *real* email addresses into SimpleLogin and choose which one to use when creating aliases! diff --git a/templates/emails/com/newsletter/mobile-darkmode.html b/templates/emails/com/newsletter/mobile-darkmode.html index 1dd6ac9f..411d8f9c 100644 --- a/templates/emails/com/newsletter/mobile-darkmode.html +++ b/templates/emails/com/newsletter/mobile-darkmode.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block content %} - {{ render_text("Hi " + user.name) }} + {{ render_text("Hi") }} {% call text() %} Son from SimpleLogin here. I hope you are doing well and are staying at home in this difficult time. By the way I'm diff --git a/templates/emails/com/newsletter/mobile-darkmode.txt b/templates/emails/com/newsletter/mobile-darkmode.txt index b00c302c..a4d56ec6 100644 --- a/templates/emails/com/newsletter/mobile-darkmode.txt +++ b/templates/emails/com/newsletter/mobile-darkmode.txt @@ -2,7 +2,7 @@ This email is sent to {{ user.email }}. Unsubscribe from our emails on {{URL}}/dashboard/setting#notification ---------------- -Hi {{user.name}} +Hi Son from SimpleLogin here. I hope you are doing well and are staying at home in this difficult time. By the way I'm writing this newsletter from my couch with my cats proofreading the text :). diff --git a/templates/emails/com/newsletter/pgp.html b/templates/emails/com/newsletter/pgp.html index 7e09e58c..133d96d6 100644 --- a/templates/emails/com/newsletter/pgp.html +++ b/templates/emails/com/newsletter/pgp.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block content %} - {{ render_text("Hi " + user.name) }} + {{ render_text("Hi") }} {{ render_text("If you happen to use Gmail, Yahoo, Outlook, etc, do you know these services can read your emails?") }} {{ render_text("If you want to keep your emails only readable by you, Pretty Good Privacy (PGP) is maybe the solution.") }} diff --git a/templates/emails/com/newsletter/pgp.txt b/templates/emails/com/newsletter/pgp.txt index a617e7b7..55ec16ea 100644 --- a/templates/emails/com/newsletter/pgp.txt +++ b/templates/emails/com/newsletter/pgp.txt @@ -2,7 +2,7 @@ This email is sent to {{ user.email }}. Unsubscribe from our emails on {{URL}}/dashboard/setting#notification ---------------- -Hi {{user.name}} +Hi If you happen to use Gmail, Yahoo, Outlook, etc, do you know these services can read your emails? diff --git a/templates/emails/com/newsletter/safari-extension.html b/templates/emails/com/newsletter/safari-extension.html index 0acdf068..d1ee779d 100644 --- a/templates/emails/com/newsletter/safari-extension.html +++ b/templates/emails/com/newsletter/safari-extension.html @@ -12,7 +12,7 @@ - {{ render_text("Hi " + user.name) }} + {{ render_text("Hi") }} {{ render_text("If you use Safari on a MacBook or iMac, you should check out our new Safari extension.") }} {{ render_text('It can be installed on App Store. Its code is available on GitHub.') }} diff --git a/templates/emails/com/newsletter/safari-extension.txt b/templates/emails/com/newsletter/safari-extension.txt index 99b2b5db..4056aa19 100644 --- a/templates/emails/com/newsletter/safari-extension.txt +++ b/templates/emails/com/newsletter/safari-extension.txt @@ -2,7 +2,7 @@ This email is sent to {{ user.email }}. Unsubscribe from our emails on {{URL}}/dashboard/setting#notification ---------------- -Hi {{user.name}} +Hi If you use Safari on a MacBook or iMac, you should check out our new Safari extension. diff --git a/templates/emails/com/onboarding/browser-extension.txt b/templates/emails/com/onboarding/browser-extension.txt index 6f6874c6..ebb9f8d7 100644 --- a/templates/emails/com/onboarding/browser-extension.txt +++ b/templates/emails/com/onboarding/browser-extension.txt @@ -2,7 +2,7 @@ This email is sent to {{ to_email }} and is part of our onboarding series. Unsubscribe from our emails on {{URL}}/dashboard/setting#notification ---------------- -Hi {{user.name}} +Hi If you want to quickly create aliases without going to SimpleLogin website, you can do that with SimpleLogin Chrome (or other Chromium-based browsers like Brave or Vivaldi), Firefox and Safari extension. diff --git a/templates/emails/com/onboarding/mailbox.txt b/templates/emails/com/onboarding/mailbox.txt index f9e8144b..e94c985a 100644 --- a/templates/emails/com/onboarding/mailbox.txt +++ b/templates/emails/com/onboarding/mailbox.txt @@ -2,7 +2,7 @@ This email is sent to {{ to_email }} and is part of our onboarding series. Unsubscribe from our emails on {{URL}}/dashboard/setting#notification ---------------- -Hi {{user.name}} +Hi If you have several email addresses, e.g. Gmail for work and Protonmail for personal stuffs, you can add them into SimpleLogin and create aliases for them. diff --git a/templates/emails/com/onboarding/pgp.txt b/templates/emails/com/onboarding/pgp.txt index 72dbb51d..b5768751 100644 --- a/templates/emails/com/onboarding/pgp.txt +++ b/templates/emails/com/onboarding/pgp.txt @@ -2,7 +2,7 @@ This email is sent to {{ to_email }} and is part of our onboarding series. Unsubscribe from our emails on {{URL}}/dashboard/setting#notification ---------------- -Hi {{user.name}} +Hi If you happen to use Gmail, Yahoo, Outlook, etc, do you know these services can read your emails? diff --git a/templates/emails/com/onboarding/send-from-alias.txt b/templates/emails/com/onboarding/send-from-alias.txt index fbbc2924..ba65cbd3 100644 --- a/templates/emails/com/onboarding/send-from-alias.txt +++ b/templates/emails/com/onboarding/send-from-alias.txt @@ -2,7 +2,7 @@ This email is sent to {{ to_email }} and is part of our onboarding series. Unsubscribe from our emails on {{URL}}/dashboard/setting#notification ---------------- -Hi {{user.name}} +Hi Do you know you can send an email to anyone from your alias? This below Youtube video walks you quickly through the steps: diff --git a/templates/emails/transactional/reply-error.html b/templates/emails/transactional/reply-error.html index 7e7440f6..5a8ff70b 100644 --- a/templates/emails/transactional/reply-error.html +++ b/templates/emails/transactional/reply-error.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block content %} - {{ render_text("Hi " + (user.name or "")) }} + {{ render_text("Hi")) }} {% call text() %} Your email cannot be sent to {{ contact.email }} from your alias {{ alias.email }}. diff --git a/templates/emails/transactional/reply-error.txt b/templates/emails/transactional/reply-error.txt index 874e11ae..e4be4162 100644 --- a/templates/emails/transactional/reply-error.txt +++ b/templates/emails/transactional/reply-error.txt @@ -1,4 +1,4 @@ -Hi {{user.name or ""}} +Hi Your email cannot be sent to {{contact.email}} from your alias {{alias.email}}. diff --git a/templates/emails/transactional/subscription-end.html b/templates/emails/transactional/subscription-end.html index 4f307839..9de3922e 100644 --- a/templates/emails/transactional/subscription-end.html +++ b/templates/emails/transactional/subscription-end.html @@ -1,11 +1,7 @@ {% extends "base.html" %} {% block content %} - {% if name %} - {{ render_text("Hi " + user.name + ",") }} - {% else %} - {{ render_text("Hi,") }} - {% endif %} + {{ render_text("Hi") }} {{ render_text("Your subscription will end on " + next_bill_date + ".") }} diff --git a/templates/emails/transactional/subscription-end.txt b/templates/emails/transactional/subscription-end.txt index b84c90fd..4df1d2f6 100644 --- a/templates/emails/transactional/subscription-end.txt +++ b/templates/emails/transactional/subscription-end.txt @@ -1,4 +1,4 @@ -Hi {{user.name}} +Hi Your subscription will end on {{ next_bill_date }}. diff --git a/templates/emails/transactional/unsubscribe-disable-alias.html b/templates/emails/transactional/unsubscribe-disable-alias.html index dc9f6f8a..2ff0566b 100644 --- a/templates/emails/transactional/unsubscribe-disable-alias.html +++ b/templates/emails/transactional/unsubscribe-disable-alias.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block content %} - {{ render_text("Hi " + user.name) }} + {{ render_text("Hi") }} {{ render_text("Your alias "+ alias +" has been disabled successfully.") }} {{ render_text("If this is a mistake, you can re-enable the alias on the dashboard.") }} {{ render_button("Enable Alias", enable_alias_url) }} diff --git a/templates/emails/transactional/unsubscribe-disable-alias.txt b/templates/emails/transactional/unsubscribe-disable-alias.txt index b2a0841e..c87a482f 100644 --- a/templates/emails/transactional/unsubscribe-disable-alias.txt +++ b/templates/emails/transactional/unsubscribe-disable-alias.txt @@ -1,4 +1,4 @@ -Hi {{user.name}} +Hi Your alias {{alias}} has been disabled successfully. diff --git a/templates/emails/transactional/verify-mailbox-change.html b/templates/emails/transactional/verify-mailbox-change.html index 553c0fea..c4e389ed 100644 --- a/templates/emails/transactional/verify-mailbox-change.html +++ b/templates/emails/transactional/verify-mailbox-change.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block content %} - {{ render_text("Hi " + user.name) }} + {{ render_text("Hi") }} {{ render_text("You recently requested to change mailbox "+ mailbox_email +" to " + mailbox_new_email + ".") }} {{ render_text("To confirm, please click on the button below.") }} {{ render_button("Confirm mailbox change", link) }} diff --git a/templates/emails/transactional/verify-mailbox-change.txt b/templates/emails/transactional/verify-mailbox-change.txt index 232e1144..175e6a93 100644 --- a/templates/emails/transactional/verify-mailbox-change.txt +++ b/templates/emails/transactional/verify-mailbox-change.txt @@ -1,4 +1,4 @@ -Hi {{user.name}} +Hi You recently requested to change mailbox {{mailbox_email}} to {{mailbox_new_email}} diff --git a/templates/emails/transactional/verify-mailbox.html b/templates/emails/transactional/verify-mailbox.html index db400ce3..fc79424c 100644 --- a/templates/emails/transactional/verify-mailbox.html +++ b/templates/emails/transactional/verify-mailbox.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block content %} - {{ render_text("Hi " + user.name) }} + {{ render_text("Hi") }} {{ render_text("You have added "+ mailbox_email +" as an additional mailbox.") }} {{ render_text("To confirm, please click on the button below.") }} {{ render_button("Confirm email", link) }} diff --git a/templates/emails/transactional/verify-mailbox.txt b/templates/emails/transactional/verify-mailbox.txt index 134ef112..e06965dd 100644 --- a/templates/emails/transactional/verify-mailbox.txt +++ b/templates/emails/transactional/verify-mailbox.txt @@ -1,4 +1,4 @@ -Hi {{user.name}} +Hi You have added {{mailbox_email}} as an additional mailbox.