diff options
author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-06-04 09:03:52 -0400 |
---|---|---|
committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-06-04 09:03:52 -0400 |
commit | 27772070e816f979e3d6d6d101e98c7258bfdb65 (patch) | |
tree | d6cea50b194a6f0d9294382631fa640fc355e763 | |
parent | 060eaaa059ec2e956651e1d17b76ea4100fe0d89 (diff) | |
download | askbot-27772070e816f979e3d6d6d101e98c7258bfdb65.tar.gz askbot-27772070e816f979e3d6d6d101e98c7258bfdb65.tar.bz2 askbot-27772070e816f979e3d6d6d101e98c7258bfdb65.zip |
added site name to the heading in the email greeting
-rw-r--r-- | askbot/deps/django_authopenid/views.py | 1 | ||||
-rw-r--r-- | askbot/templates/authopenid/email_validation.html | 12 |
2 files changed, 7 insertions, 6 deletions
diff --git a/askbot/deps/django_authopenid/views.py b/askbot/deps/django_authopenid/views.py index bea67d2f..8f6ee101 100644 --- a/askbot/deps/django_authopenid/views.py +++ b/askbot/deps/django_authopenid/views.py @@ -1256,6 +1256,7 @@ def send_email_key(email, key, handler_url_name='user_account_recover'): {'site': askbot_settings.APP_SHORT_NAME} data = { + 'site_name': askbot_settings.APP_SHORT_NAME, 'validation_link': site_url(reverse(handler_url_name)) + \ '?validation_code=' + key } diff --git a/askbot/templates/authopenid/email_validation.html b/askbot/templates/authopenid/email_validation.html index 616b285f..4a74b23f 100644 --- a/askbot/templates/authopenid/email_validation.html +++ b/askbot/templates/authopenid/email_validation.html @@ -1,20 +1,20 @@ {% extends "email/base_mail.html"%} -{% block title %}{% trans %}Greetings from the Q&A forum{% endtrans %},{%endblock%} -{% block headline%}{% trans %}Greetings from the Q&A forum{% endtrans %},{%endblock%} +{% block title %}{% trans %}Greetings from the {{ site_name }}{% endtrans %},{%endblock%} +{% block headline %}{% trans %}Greetings from the {{ site_name }}{% endtrans %},{%endblock%} -{%block content%} +{% block content %} <p>{% trans %}To make use of the Forum, please follow the link below:{% endtrans %}</p> -<p><a href="{{validation_link}}" >{{validation_link}}</a></p> +<p><a href="{{ validation_link }}" >{{ validation_link }}</a></p> <p>{% trans %}Following the link above will help us verify your email address.{% endtrans %}</p> <p>{% trans %}If you believe that this message was sent in mistake - no further action is needed. Just ignore this email, we apologize for any inconvenience{% endtrans %}</p> -{%endblock%} +{% endblock %} -{%block footer %} +{% block footer %} {% include "email/footer.html" %} {% endblock %} |