Added extra check to avoid empty tags been sent in notifications.

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

diff --git a/forum/skins/default/templates/notifications/newanswer.html b/forum/skins/default/templates/notifications/newanswer.html
index 2350185e2a686468a50f4c2dc4991124a75c3632..1f3140ce4851c26a525b60849e87b6d8dae33710 100644 (file)
--- a/forum/skins/default/templates/notifications/newanswer.html
+++ b/forum/skins/default/templates/notifications/newanswer.html
@@ -1,18 +1,19 @@
 {% 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
-    answer_author = answer.author.username
+    prefix = html.mark_safe(smart_str(settings.EMAIL_SUBJECT_PREFIX))
+    app_name = smart_str(settings.APP_SHORT_NAME)
+    safe_app_name = html.mark_safe(smart_str(settings.APP_SHORT_NAME))
+    answer_author = html.mark_safe(smart_str(answer.author.username))

     question = answer.question
     question = answer.question

-    question_title = html.mark_safe(question.title)
-    safe_body = html.html2text(answer.html)
+    question_title = html.mark_safe(smart_str(question.title))
+    safe_body = html.html2text(smart_str(answer.html))

     author_link = html.objlink(answer.author, style=settings.EMAIL_ANCHOR_STYLE)
     question_link = html.objlink(question, style=settings.EMAIL_ANCHOR_STYLE)
 {% enddeclare %}
 
 {% email %}
     author_link = html.objlink(answer.author, style=settings.EMAIL_ANCHOR_STYLE)
     question_link = html.objlink(question, style=settings.EMAIL_ANCHOR_STYLE)
 {% enddeclare %}
 
 {% email %}

-    {% subject %}{% blocktrans %}{{ prefix }} New answer to {{ question_title }}{% endblocktrans %}{% endsubject %}
+    {% subject %}{% blocktrans %}{{ prefix }} New answer to: {{ question_title }}{% endblocktrans %}{% endsubject %}

 
     {% htmlcontent notifications/base.html %}
         <p style="{{ p_style }}">
 
     {% htmlcontent notifications/base.html %}
         <p style="{{ p_style }}">


@@ -31,7 +32,7 @@
 
 {% textcontent notifications/base_text.html %}
 {% blocktrans %}
 
 {% textcontent notifications/base_text.html %}
 {% blocktrans %}

-{{ answer_author }} has just posted a new answer on {{ app_name }} to the question
+{{ answer_author }} has just posted a new answer on {{ safe_app_name }} to the question

 "{{ question_title }}":
 {% endblocktrans %}
 {{ safe_body }}
 "{{ question_title }}":
 {% endblocktrans %}
 {{ safe_body }}