#OSQA-585, adding support for plain text emails for the daily digest.

[osqa.git] / forum / skins / default / templates / notifications / feedback.html

diff --git a/forum/skins/default/templates/notifications/feedback.html b/forum/skins/default/templates/notifications/feedback.html
index 45e4f820bf9403a1917576998e7ecdb7686a4d39..52aa6adace5b593420d3fb95d5460846b53ac336 100644 (file)
--- a/forum/skins/default/templates/notifications/feedback.html
+++ b/forum/skins/default/templates/notifications/feedback.html
@@ -1,8 +1,8 @@
 {% load i18n extra_tags email_tags %}
 
 {% declare %}
 {% load i18n extra_tags email_tags %}
 
 {% declare %}

-    prefix = settings.EMAIL_SUBJECT_PREFIX
-    app_name = settings.APP_SHORT_NAME
+    prefix = html.mark_safe(settings.EMAIL_SUBJECT_PREFIX)
+    app_name = html.mark_safe(settings.APP_SHORT_NAME)

 
     exclude_greeting = True
     exclude_finetune = True
 
     exclude_greeting = True
     exclude_finetune = True


@@ -26,11 +26,11 @@
     {% endhtmlcontent %}
 
 {% textcontent notifications/base_text.html %}
     {% endhtmlcontent %}
 
 {% textcontent notifications/base_text.html %}

-{% trans "Sender" %}: {% if name %}{{ name }}{% else %}{% trans "anonymous" %}{% endif %}
-{% trans "email" %}: {{ email }}
+{% trans "Sender" %}: {% if name %}{{ name|safe }}{% else %}{% trans "anonymous" %}{% endif %}
+{% trans "email" %}: {{ email|safe }}

 ip: {{ ip }}
 
 ip: {{ ip }}
 

-{% trans "Message body:" %} {{ message }}
+{% trans "Message body:" %} {{ message|safe }}

 {% endtextcontent %}
 
 {% endemail %}
 {% endtextcontent %}
 
 {% endemail %}