From 00737f68decd1ae5d6c606f34e695468a3020e40 Mon Sep 17 00:00:00 2001 From: Kelp8 <155227790+Kelp8@users.noreply.github.com> Date: Tue, 2 Jan 2024 16:20:48 +0400 Subject: [PATCH] Minor wordings change (#1985) * Wording changes * Add information to avoid being put in SPAM * Remove word repeating * Add forum mention * Add forum mention to header.html * Add info to avoid person marking as SPAM --- templates/auth/mfa.html | 2 +- templates/auth/register.html | 2 +- templates/auth/register_waiting_activation.html | 1 + templates/emails/transactional/activation.html | 1 + templates/footer.html | 4 ++++ templates/header.html | 9 ++++++++- 6 files changed, 16 insertions(+), 3 deletions(-) diff --git a/templates/auth/mfa.html b/templates/auth/mfa.html index 11a6f061..c120d005 100644 --- a/templates/auth/mfa.html +++ b/templates/auth/mfa.html @@ -15,7 +15,7 @@ {{ otp_token_form.csrf_token }}
Token
-
Please enter the 2FA code from your 2FA authenticator
+
Please enter the 2FA code from your authenticator app
{{ otp_token_form.token(class="form-control", autofocus="true") }} {{ render_field_errors(otp_token_form.token) }}
diff --git a/templates/auth/register.html b/templates/auth/register.html index e081c906..6be4f4cf 100644 --- a/templates/auth/register.html +++ b/templates/auth/register.html @@ -9,7 +9,7 @@

Create new account

- {{ form.email(class="form-control", type="email", placeholder="YourName@protonmail.com") }} + {{ form.email(class="form-control", type="email", placeholder="username@proton.me") }}
Emails sent to your alias will be forwarded to this email address.
diff --git a/templates/auth/register_waiting_activation.html b/templates/auth/register_waiting_activation.html index fc2b5c48..3c902b36 100644 --- a/templates/auth/register_waiting_activation.html +++ b/templates/auth/register_waiting_activation.html @@ -7,6 +7,7 @@

An email to validate your email is on its way.

Please check your inbox/spam folder.

+

Make sure to mark the message as not spam so that future messages come to your normal inbox

{% endblock %} diff --git a/templates/emails/transactional/activation.html b/templates/emails/transactional/activation.html index e73a0ccb..e7a2c476 100644 --- a/templates/emails/transactional/activation.html +++ b/templates/emails/transactional/activation.html @@ -4,6 +4,7 @@ {{ render_text("Thank you for choosing SimpleLogin.") }} {{ render_text("To get started, please confirm that " + email + " is your email address by clicking on the button below within 1 hour.") }} + {{ render_text("If it wasn't you, maybe someone entered your email by mistake. In this case you can ignore this mail.") }} {{ render_button("Verify email", activation_link) }} {{ render_text('Thanks,
diff --git a/templates/footer.html b/templates/footer.html index 903e04e2..a15c9f60 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -106,6 +106,10 @@ Documentation +
  • + Forum +
  • diff --git a/templates/header.html b/templates/header.html index 1401d597..a07a2713 100644 --- a/templates/header.html +++ b/templates/header.html @@ -83,7 +83,14 @@