Merge of branches/jambazov to trunk. Incoporating the new convert comment to answer...

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

diff --git a/forum/skins/default/templates/notifications/newquestion.html b/forum/skins/default/templates/notifications/newquestion.html
index e408950cc6d78294d96855678fc785dc11dcb142..7068bbbc2e7aaa5abd1ec06c735ac6922544a00b 100644 (file)
--- a/forum/skins/default/templates/notifications/newquestion.html
+++ b/forum/skins/default/templates/notifications/newquestion.html
@@ -1,25 +1,23 @@
 {% load i18n extra_tags email_tags %}
 
 {% declare %}
 {% load i18n extra_tags email_tags %}
 
 {% declare %}

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

     app_name = settings.APP_SHORT_NAME
     app_name = settings.APP_SHORT_NAME

-    question_author = question.author.username
+    safe_app_name = html.mark_safe(settings.APP_SHORT_NAME)
+    question_author = html.mark_safe(question.author.username)

     question_url = settings.APP_URL + question.get_absolute_url()
     question_url = settings.APP_URL + question.get_absolute_url()

-    question_title = question.title
-    question_tags = question.tagnames
+    question_title = html.mark_safe(question.title)
+    question_tags = html.mark_safe(question.tagnames)

     safe_body = html.html2text(question.html)
     safe_body = html.html2text(question.html)

+    author_link = html.objlink(question.author, style=settings.EMAIL_ANCHOR_STYLE)
+    question_link = html.objlink(question, style=settings.EMAIL_ANCHOR_STYLE)
+    tag_links = html.mark_safe(" ".join([html.objlink(t, style=settings.EMAIL_ANCHOR_STYLE) for t in question.tags.all()]))

 {% enddeclare %}
 
 {% email %}
 {% enddeclare %}
 
 {% email %}

-    {% subject %}{% blocktrans %}{{ prefix }} New question on {{ app_name }}{% endblocktrans %}{% endsubject %}
+    {% subject %}{% blocktrans %}{{ prefix }} New question: {{ question_title }} on {{ safe_app_name }}{% endblocktrans %}{% endsubject %}

 
     {% htmlcontent notifications/base.html %}
 
     {% htmlcontent notifications/base.html %}

-        {% declare %}
-            author_link = html.objlink(question.author, style=a_style)
-            question_link = html.objlink(question, style=a_style)
-            tag_links = html.mark_safe(" ".join([html.objlink(t, style=a_style) for t in question.tags.all()]))
-        {% enddeclare %}
-

         <p style="{{ p_style }}">
             {% blocktrans %}
             {{ author_link }} has just posted a new question on {{ app_name }}, entitled
         <p style="{{ p_style }}">
             {% blocktrans %}
             {{ author_link }} has just posted a new question on {{ app_name }}, entitled


@@ -37,7 +35,7 @@
 
 {% textcontent notifications/base_text.html %}
 {% blocktrans %}
 
 {% textcontent notifications/base_text.html %}
 {% blocktrans %}

-{{ question_author }} has just posted a new question on {{ app_name }}, entitled
+{{ question_author }} has just posted a new question on {{ safe_app_name }}, entitled

 "{{ question_title }}" and tagged {{ question_tags }}:
 {% endblocktrans %}
 {{ safe_body }}
 "{{ question_title }}" and tagged {{ question_tags }}:
 {% endblocktrans %}
 {{ safe_body }}