be able to control right navigation visibility in the administration interface

[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 ec4d2116fbe2a0ab1463eeb30a832e9d85205781..bb70300e3973d15a0c472bbe0c28dde82500a322 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 %}
-    prefix = settings.EMAIL_SUBJECT_PREFIX
-    app_name = settings.APP_SHORT_NAME
+    prefix = smart_str(settings.EMAIL_SUBJECT_PREFIX)
+    app_name = smart_str(settings.APP_SHORT_NAME)
 
     exclude_greeting = True
     exclude_finetune = True
@@ -12,14 +12,9 @@
     {% subject %}{% blocktrans %}{{ prefix }} Feedback message from {{ app_name }}{% endblocktrans %}{% endsubject %}
 
     {% htmlcontent notifications/base.html %}
-        <p style="{{ p_style }}}">
-            {% trans "Sender" %}:
-            {% if user.is_authenticated %}
-                {{ user.username }} <br /> {% trans "email" %}:{{ user.email }}
-            {% else %}
-                {% if name %}{{ name }}{% else %}{% trans "anonymous" %}{% endif %}
-                {% if email %}{% trans "email" %}:{{ email }}{% endif %}
-            {% endif %}
+        <p style="{{ p_style }}">
+            {% trans "Sender" %}:{% if name %}{{ name }}{% else %}{% trans "anonymous" %}{% endif %}<br />
+            {% trans "email" %}: {{ email }}
             <br/>
                 ip: {{ ip }}
         </p>
@@ -31,16 +26,11 @@
     {% endhtmlcontent %}
 
 {% textcontent notifications/base_text.html %}
-{% if user.is_authenticated %}
-{% trans "Sender" %}: {{ user.username }}
-{% trans "email" %}: {{ user.email }}
-{% else %}
-{% trans "Sender" %}: {% if name %}{{ name }}{% else %}{% trans "anonymous" %}{% endif %}
-{% if email %}{% trans "email" %}: {{ email }}{% endif %}
-{% endif %}
+{% trans "Sender" %}: {% if name %}{{ name|safe }}{% else %}{% trans "anonymous" %}{% endif %}
+{% trans "email" %}: {{ email|safe }}
 ip: {{ ip }}
 
-{% trans "Message body:" %} {{ message }}
+{% trans "Message body:" %} {{ message|safe }}
 {% endtextcontent %}
 
 {% endemail %}