merging jambazov > trunk

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

diff --git a/forum/skins/default/templates/notifications/answeraccepted.html b/forum/skins/default/templates/notifications/answeraccepted.html
index 76927e3c5d803df5ed37a41b7cb962e3001e0fc4..7658087f9fc2e0eca44aa5589bdf995a134a7a25 100644 (file)
--- a/forum/skins/default/templates/notifications/answeraccepted.html
+++ b/forum/skins/default/templates/notifications/answeraccepted.html
@@ -1,19 +1,18 @@
 {% 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(settings.EMAIL_SUBJECT_PREFIX)
+    answer_author = html.mark_safe(answer.author.username)

     question = answer.question
     question_title = html.mark_safe(question.title)
     question = answer.question
     question_title = html.mark_safe(question.title)

-    accepted_by = answer.nstate.accepted.by.username
+    accepted_by = html.mark_safe(answer.nstate.accepted.by.username)

     accepted_by_link = html.objlink(answer.nstate.accepted.by, style=settings.EMAIL_ANCHOR_STYLE)
     answer_author_link = html.objlink(answer.author, style=settings.EMAIL_ANCHOR_STYLE)
     question_link = html.objlink(question, style=settings.EMAIL_ANCHOR_STYLE)
 {% enddeclare %}
 
 {% email %}
     accepted_by_link = html.objlink(answer.nstate.accepted.by, style=settings.EMAIL_ANCHOR_STYLE)
     answer_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 }} An answer to {{ question_title }} has been accepted{% endblocktrans %}{% endsubject %}
+    {% subject %}{% blocktrans %}{{ prefix }} An answer to: {{ question_title }} has been accepted{% endblocktrans %}{% endsubject %}

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