improved format of feedback email message, thanks to Samuel

3 files changed, 15 insertions, 18 deletions

diff --git a/askbot/skins/default/templates/feedback_email.txt b/askbot/skins/default/templates/feedback_email.txt
index df768180..a729066a 100644
--- a/askbot/skins/default/templates/feedback_email.txt
+++ b/askbot/skins/default/templates/feedback_email.txt
@@ -1,19 +1,13 @@
-{% load i18n %}
 {% spaceless %}
-{% blocktrans with settings.APP_TITLE|safe as site_title %}
-Hello, this is a {{site_title}} forum feedback message
-{% endblocktrans %}
+{% trans site_title = settings.APP_SHORT_NAME|safe %}
+Hello, this is a {{site_title}} forum feedback message.
+{% endtrans %}
 {% endspaceless %}
+{% if user.is_authenticated() -%}
+    {{user.username|safe}} ({{user.email|safe}}, ip:{{request.META.REMOTE_ADDR}})
+{%- else %}
+    {%- if name %}{{name|safe}} {% else %}{% trans %}Anonymous{% endtrans %} {% endif -%}
+    ({%- if email %}, {% endif -%}ip:{{request.META.REMOTE_ADDR}})
+{%- endif %} wrote:
 
-{% spaceless %}
-{% trans "Sender is" %}
-{% if user.is_authenticated %}
-    {{user.username|safe}} {% trans "email" %}:{{user.email|safe}} 
-{% else %}
-    {% if name %}{{name|safe}}{% else %}{% trans "anonymous" %}{% endif %}
-    {% if email %}{% trans "email" %}:{{email|safe}}{% endif %}
-{% endif %}
-    ip:{{request.META.REMOTE_ADDR}}
-{% endspaceless %}
-
-{% trans "Message body:" %} {{message|safe}}
+{{message|safe}}
diff --git a/askbot/utils/mail.py b/askbot/utils/mail.py
index 1c78e81d..d41d666a 100644
--- a/askbot/utils/mail.py
+++ b/askbot/utils/mail.py
@@ -83,6 +83,8 @@ def mail_moderators(
     from askbot.models import User
     recipient_list = User.objects.filter(
                     Q(status='m') | Q(is_superuser=True)
+                ).filter(
+                    is_active = True
                 ).values_list('email', flat=True)
     recipient_list = set(recipient_list)
 
diff --git a/askbot/views/meta.py b/askbot/views/meta.py
index 0fd3d60e..328aebd1 100644
--- a/askbot/views/meta.py
+++ b/askbot/views/meta.py
@@ -17,7 +17,7 @@ from askbot.utils.forms import get_next_url
 from askbot.utils.mail import mail_moderators
 from askbot.models import BadgeData, Award, User
 from askbot.models import badges as badge_data
-from askbot.skins.loaders import render_into_skin
+from askbot.skins.loaders import get_template, render_into_skin
 from askbot.conf import settings as askbot_settings
 from askbot import skins
 
@@ -61,7 +61,8 @@ def feedback(request):
                 data['email'] = form.cleaned_data.get('email',None)
             data['message'] = form.cleaned_data['message']
             data['name'] = form.cleaned_data.get('name',None)
-            message = render_to_response('feedback_email.txt',data,context_instance=RequestContext(request))
+            template = get_template('feedback_email.txt', request)
+            message = template.render(RequestContext(request, data))
             mail_moderators(_('Q&A forum feedback'), message)
             msg = _('Thanks for the feedback!')
             request.user.message_set.create(message=msg)