Solves several email encoding issues.

[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 6d59f1b95b9a88f6eacaa2653867ed1302729cdf..043a24d9dfffb3237ab6a6b145fe2b89777ade81 100644 (file)
--- a/forum/skins/default/templates/notifications/newcomment.html
+++ b/forum/skins/default/templates/notifications/newcomment.html
@@ -1,47 +1,49 @@
-{% load i18n extra_tags email_tags %}\r
-\r
-{% declare %}\r
-    prefix = settings.EMAIL_SUBJECT_PREFIX\r
-    app_name = settings.APP_SHORT_NAME\r
-    app_url = settings.APP_URL\r
-    post = comment.parent\r
-    question = post.question and post.question or post\r
-    post_author = post.author.username\r
-    comment_author = comment.author\r
-    question_url = question.get_absolute_url()\r
-    question_title = question.title\r
-{% enddeclare %}\r
-\r
-{% email %}\r
-    {% subject %}{% blocktrans %}{{ prefix }} New comment on {{ question_title }}{% endblocktrans %}{% endsubject %}\r
-\r
-    {% htmlcontent notifications/base.html %}\r
-        <p style="{{ p_style }}">\r
-            {% blocktrans %}{{ comment_author }} has just posted a comment on {% endblocktrans %}\r
-            {% ifnotequal post question %}\r
-                {% blocktrans %}the answer posted by {{ post_author }} to {% endblocktrans %}\r
-            {% endifnotequal %}\r
-            {% blocktrans %}the question <a href="{{ app_url }}{{ question_url }}">{{ question_title }}</a>{% endblocktrans %}\r
-        </p>\r
-\r
-        <blockquote>\r
-        {{ comment.comment }}\r
-        </blockquote>\r
-\r
-        <p style="{{ p_style }}">{% trans "Don't forget to come over and cast your vote." %}</p>\r
-    {% endhtmlcontent %}\r
-\r
-    {% textcontent notifications/base_text.html %}\r
-        {% blocktrans %}{{ comment_author }} has just posted a comment on {% endblocktrans %}\r
-        {% ifnotequal post question %}\r
-            {% blocktrans %}the answer posted by {{ post_author }} to {% endblocktrans %}\r
-        {% endifnotequal %}\r
-        {% blocktrans %}the question "{{ question_title }}"{% endblocktrans %}\r
-\r
-\r
-        {{ comment.body }}\r
-\r
-        {% trans "Don't forget to come over and cast your vote." %}\r
-    {% endtextcontent %}\r
-\r
-{% endemail %}\r
+{% load i18n extra_tags email_tags %}
+
+{% declare %}
+    prefix = settings.EMAIL_SUBJECT_PREFIX
+    app_name = settings.APP_SHORT_NAME
+    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 = html.mark_safe(question.title)
+    safe_body = html.html2text(comment.comment)
+{% enddeclare %}
+
+{% email %}
+    {% 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 %}
+                {% blocktrans %}the answer posted by {{ post_author }} to {% endblocktrans %}
+            {% endifnotequal %}
+            {% blocktrans %}the question {{ question_link }}{% endblocktrans %}
+        </p>
+
+        <blockquote>
+        {{ comment.comment }}
+        </blockquote>
+
+        <p style="{{ p_style }}">{% trans "Don't forget to come over and cast your vote." %}</p>
+    {% endhtmlcontent %}
+
+{% 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 %}
+{% endifnotequal %}
+{% blocktrans %}the question "{{ question_title }}"{% endblocktrans %}
+{{ safe_body }}
+
+{% trans "Don't forget to come over and cast your vote." %}
+{% endtextcontent %}
+
+{% endemail %}