OSQA-600, notification templates unicode fixes.

[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 947de0ca513dee5c8073b9c2c58a5b73f31abea4..5936d5230f9ef1a7ab1c7eb5f0488cf8d581f4f7 100644 (file)
--- a/forum/skins/default/templates/notifications/newanswer.html
+++ b/forum/skins/default/templates/notifications/newanswer.html
@@ -1,22 +1,21 @@
 {% 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
-    question = answer.question
-    question_title = html.mark_safe(question.title)
-    safe_body = html.html2text(answer.html)
+    prefix = smart_str(html.mark_safe(settings.EMAIL_SUBJECT_PREFIX))
+    app_name = smart_str(settings.APP_SHORT_NAME)
+    safe_app_name = smart_str(html.mark_safe(settings.APP_SHORT_NAME))
+    answer_author = smart_str(html.mark_safe(answer.author.username))
+    question = smart_str(answer.question)
+    question_title = smart_str(html.mark_safe(question.title))
+    safe_body = smart_str(html.html2text(answer.html))
+    author_link = smart_str(html.objlink(answer.author, style=settings.EMAIL_ANCHOR_STYLE))
+    question_link = smart_str(html.objlink(question, style=settings.EMAIL_ANCHOR_STYLE))

 {% enddeclare %}
 
 {% email %}
 {% 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 %}
 
     {% htmlcontent notifications/base.html %}

-        {% declare %}
-            author_link = html.objlink(answer.author, style=a_style)
-            question_link = html.objlink(question, style=a_style)
-        {% enddeclare %}

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


@@ -33,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 }}