From 27772070e816f979e3d6d6d101e98c7258bfdb65 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Tue, 4 Jun 2013 09:03:52 -0400
Subject: added site name to the heading in the email greeting

---
 askbot/deps/django_authopenid/views.py            |  1 +
 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 %}
-- 
cgit v1.2.3-1-g7c22