From 028dad6105af31f86dce8c0b685a4e32688a2129 Mon Sep 17 00:00:00 2001
From: psy <psy@cccv.de>
Date: Sun, 24 Jan 2021 15:52:30 +0000
Subject: [PATCH] refactor mails
---
.../selfservice/templates/mailverification.mail.txt | 8 +++-----
uffd/selfservice/templates/newuser.mail.txt | 13 ++++++-------
uffd/selfservice/templates/passwordreset.mail.txt | 10 ++++------
3 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/uffd/selfservice/templates/mailverification.mail.txt b/uffd/selfservice/templates/mailverification.mail.txt
index bd9a0b58..405b2e65 100644
--- a/uffd/selfservice/templates/mailverification.mail.txt
+++ b/uffd/selfservice/templates/mailverification.mail.txt
@@ -1,8 +1,6 @@
Hi {{ user.displayname }},
-you have requested to change your mail address.
-To confirm the change, please visit this URL: {{ url_for('selfservice.token_mail', token=token, _external=True) }}
-**Please note this link is only valid for 48h**
+you have requested to change your mail address. To confirm the change, please visit the following url:
+{{ url_for('selfservice.token_mail', token=token, _external=True) }}
-Kind regards,
-uffd
+**The link is valid for 48h**
diff --git a/uffd/selfservice/templates/newuser.mail.txt b/uffd/selfservice/templates/newuser.mail.txt
index 7ef8a469..d21aa834 100644
--- a/uffd/selfservice/templates/newuser.mail.txt
+++ b/uffd/selfservice/templates/newuser.mail.txt
@@ -1,12 +1,11 @@
Hi {{ user.displayname }},
-welcome to the CCCV infrastructure.
-An account was created for you, visit this url to set your password: {{ url_for('selfservice.token_password', token=token, _external=True) }}
-**Please note this link is only valid for 48h**
+welcome to the CCCV infrastructure. An account was created for you, please visit the following url to set your
+password: {{ url_for('selfservice.token_password', token=token, _external=True) }}
-You can find more information here: https://docs.cccv.de/
+**The link is valid for 48h**
-If you have no idea why someone would create an account for you to be used for the next CCC event organization, please contact it@cccv.de.
+You can find more information at https://docs.cccv.de/.
-Kind regards,
-uffd
\ No newline at end of file
+If you have no idea why someone would create an account for you to be used for the next CCC event organization, please
+contact the infra team at it@cccv.de.
diff --git a/uffd/selfservice/templates/passwordreset.mail.txt b/uffd/selfservice/templates/passwordreset.mail.txt
index 658d8aee..88ab6676 100644
--- a/uffd/selfservice/templates/passwordreset.mail.txt
+++ b/uffd/selfservice/templates/passwordreset.mail.txt
@@ -1,10 +1,8 @@
Hi {{ user.displayname }},
-you have requested a password reset.
-To reset your password, visit this url: {{ url_for('selfservice.token_password', token=token, _external=True) }}
-**Please note this link is only valid for 48h**
+you have requested a password reset. To reset your password, visit the following url:
+{{ url_for('selfservice.token_password', token=token, _external=True) }}
-If you did not request a password reset, you do not need to do anything.
+**The link is valid for 48h**
-Kind regards,
-uffd
+If you did not request a password reset, please ignore this message.
--
GitLab