Improving the canned comments feature, now we can use Django style template syntax...

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

diff --git a/forum/skins/default/templates/notifications/newcomment.html b/forum/skins/default/templates/notifications/newcomment.html
index a4859a47ec2a3a27812ea69c4c185fdc7e6717e7..b72b86722573906a965e9a4cb04fff76b541196f 100644 (file)
--- a/forum/skins/default/templates/notifications/newcomment.html
+++ b/forum/skins/default/templates/notifications/newcomment.html
@@ -1,25 +1,22 @@
 {% load i18n extra_tags email_tags %}
 
 {% declare %}
-    prefix = settings.EMAIL_SUBJECT_PREFIX
-    app_name = settings.APP_SHORT_NAME
+    prefix = html.mark_safe(smart_str(settings.EMAIL_SUBJECT_PREFIX))
     post = comment.parent
     question = post.question and post.question or post
-    post_author = post.author.username
-    comment_author = comment.author
-    question_url = question.get_absolute_url()
-    question_title = question.title
-    safe_body = html.html2text(comment.comment)
+    post_author = smart_str(post.author.username)
+    safe_post_author = html.mark_safe(smart_str(post.author.username))
+    comment_author = html.mark_safe(smart_str(comment.author))
+    question_title = html.mark_safe(smart_str(question.title))
+    safe_body = html.html2text(smart_str(comment.comment))
+    author_link = html.objlink(comment.author, style=settings.EMAIL_ANCHOR_STYLE)
+    question_link = html.objlink(question, style=settings.EMAIL_ANCHOR_STYLE)
 {% enddeclare %}
 
 {% email %}
-    {% subject %}{% blocktrans %}{{ prefix }} New comment on {{ question_title }}{% endblocktrans %}{% endsubject %}
+    {% subject %}{% blocktrans %}{{ prefix }} New comment on: {{ question_title }}{% endblocktrans %}{% endsubject %}
 
     {% htmlcontent notifications/base.html %}
-        {% declare %}
-            author_link = html.objlink(comment.author, style=a_style)
-            question_link = html.objlink(question, style=a_style)
-        {% enddeclare %}
         <p style="{{ p_style }}">
             {% blocktrans %}{{ author_link }} has just posted a comment on {% endblocktrans %}
             {% ifnotequal post question %}
@@ -38,7 +35,7 @@
 {% textcontent notifications/base_text.html %}
 {% blocktrans %}{{ comment_author }} has just posted a comment on {% endblocktrans %}
 {% ifnotequal post question %}
-{% blocktrans %}the answer posted by {{ post_author }} to {% endblocktrans %}
+{% blocktrans %}the answer posted by {{ safe_post_author }} to {% endblocktrans %}
 {% endifnotequal %}
 {% blocktrans %}the question "{{ question_title }}"{% endblocktrans %}
 {{ safe_body }}