From 6a6e3b3c4a1e8b2fee6d59ea5d4c371798827896 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mika=C3=ABl=20Ates?= Date: Fri, 8 Apr 2016 18:32:03 +0200 Subject: [PATCH 1/1] Use template name format as stated in send_templated_mail for registration emails. --- src/authentic2/registration_backend/forms.py | 4 ++-- src/authentic2/templates/registration/activation_email.html | 8 -------- src/authentic2/templates/registration/activation_email.txt | 6 ------ src/authentic2/templates/registration/activation_email_body.html | 8 ++++++++ src/authentic2/templates/registration/activation_email_body.txt | 6 ++++++ 5 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 src/authentic2/templates/registration/activation_email.html delete mode 100644 src/authentic2/templates/registration/activation_email.txt create mode 100644 src/authentic2/templates/registration/activation_email_body.html create mode 100644 src/authentic2/templates/registration/activation_email_body.txt diff --git a/src/authentic2/registration_backend/forms.py b/src/authentic2/registration_backend/forms.py index 4414a97..8a139cc 100644 --- a/src/authentic2/registration_backend/forms.py +++ b/src/authentic2/registration_backend/forms.py @@ -59,10 +59,10 @@ class RegistrationForm(Form): ctx_dict) subject = ''.join(subject.splitlines()) - message = render_to_string('registration/activation_email.txt', + message = render_to_string('registration/activation_email_body.txt', ctx_dict) - html_message = render_to_string('registration/activation_email.html', + html_message = render_to_string('registration/activation_email_body.html', ctx_dict) send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, [data['email']], fail_silently=True, diff --git a/src/authentic2/templates/registration/activation_email.html b/src/authentic2/templates/registration/activation_email.html deleted file mode 100644 index fc66642..0000000 --- a/src/authentic2/templates/registration/activation_email.html +++ /dev/null @@ -1,8 +0,0 @@ -{% load i18n %} - - -

{% blocktrans %}You created a new account on {{ site }}. To activate your account, please click here{% endblocktrans %} -

-

{% blocktrans %}This link link is valid for {{ expiration_days }} days.{% endblocktrans %} - - diff --git a/src/authentic2/templates/registration/activation_email.txt b/src/authentic2/templates/registration/activation_email.txt deleted file mode 100644 index fd984a4..0000000 --- a/src/authentic2/templates/registration/activation_email.txt +++ /dev/null @@ -1,6 +0,0 @@ -{% load i18n %} -{% trans "Activate account" %}: - -{{ registration_url }} - -{% blocktrans %}Link is valid for {{ expiration_days }} days.{% endblocktrans %} diff --git a/src/authentic2/templates/registration/activation_email_body.html b/src/authentic2/templates/registration/activation_email_body.html new file mode 100644 index 0000000..fc66642 --- /dev/null +++ b/src/authentic2/templates/registration/activation_email_body.html @@ -0,0 +1,8 @@ +{% load i18n %} + + +

{% blocktrans %}You created a new account on {{ site }}. To activate your account, please click here{% endblocktrans %} +

+

{% blocktrans %}This link link is valid for {{ expiration_days }} days.{% endblocktrans %} + + diff --git a/src/authentic2/templates/registration/activation_email_body.txt b/src/authentic2/templates/registration/activation_email_body.txt new file mode 100644 index 0000000..fd984a4 --- /dev/null +++ b/src/authentic2/templates/registration/activation_email_body.txt @@ -0,0 +1,6 @@ +{% load i18n %} +{% trans "Activate account" %}: + +{{ registration_url }} + +{% blocktrans %}Link is valid for {{ expiration_days }} days.{% endblocktrans %} -- 2.1.4