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 425f404a5b5fce196ace334afd1fde0365fbc1ae..5936d5230f9ef1a7ab1c7eb5f0488cf8d581f4f7 100644 (file)
--- a/forum/skins/default/templates/notifications/newanswer.html
+++ b/forum/skins/default/templates/notifications/newanswer.html
@@ -1,27 +1,44 @@
-{% extends "email_base.html" %}\r
-{% load i18n %}\r
-{% load extra_tags %}\r
-\r
-{% block content %}\r
-    <p>{% trans "Hello" %} {% user_var username %},</p>\r
-\r
-    <p>\r
-        {% blocktrans with answer.author.username as author_name and settings.APP_SHORT_NAME as app_title and settings.APP_URL as app_url and question.get_absolute_url as question_url and question.title as question_title %}\r
-        {{ author_name }} has just posted a new answer on {{ app_title }} to the question\r
-        <a href="{{ app_url }}{{ question_url }}">{{ question_title }}"</a>:\r
-        {% endblocktrans %}\r
-    </p>\r
-\r
-    <blockquote>\r
-        {{ answer.html|safe }}\r
-    </blockquote>\r
-\r
-    <p>\r
-    {% blocktrans %}\r
-        Don't forget to come over and cast your vote.\r
-    {% endblocktrans %}\r
-    </p>\r
-\r
-    <p>{% blocktrans %}Sincerely,<br />\r
-    Forum Administrator{% endblocktrans %}</p>\r
-{% endblock %}\r
+{% load i18n extra_tags email_tags %}
+
+{% declare %}
+    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 %}
+    {% subject %}{% blocktrans %}{{ prefix }} New answer to: {{ question_title }}{% endblocktrans %}{% endsubject %}
+
+    {% htmlcontent notifications/base.html %}
+        <p style="{{ p_style }}">
+            {% blocktrans %}
+            {{ author_link }} has just posted a new answer on {{ app_name }} to the question
+            {{ question_link }}:
+            {% endblocktrans %}
+        </p>
+
+        <blockquote>
+        {{ answer.html|safe }}
+        </blockquote>
+
+        <p style="{{ p_style }}">{% trans "Don't forget to come over and cast your vote." %}</p>
+    {% endhtmlcontent %}
+
+{% textcontent notifications/base_text.html %}
+{% blocktrans %}
+{{ answer_author }} has just posted a new answer on {{ safe_app_name }} to the question
+"{{ question_title }}":
+{% endblocktrans %}
+{{ safe_body }}
+
+{% trans "Don't forget to come over and cast your vote." %}
+{% endtextcontent %}
+
+{% endemail %}
+