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 30e3c6543a4406debab01af6384b0f8fee1bf313..043a24d9dfffb3237ab6a6b145fe2b89777ade81 100644 (file)
--- a/forum/skins/default/templates/notifications/newcomment.html
+++ b/forum/skins/default/templates/notifications/newcomment.html
@@ -1,34 +1,49 @@
-{% 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 comment.user.username as author_name %}\r
-            {{ author_name }} has just posted a comment on\r
-        {% endblocktrans %}\r
-\r
-        {% if post.question %}\r
-            {% blocktrans with settings.APP_URL as app_url and post.author.username as poster_name and post.author.get_profile_url as poster_url%}\r
-                the answer posted by <a href="{{ app_url }}{{ poster_url }}">{{ poster_name }}</a> to\r
-            {% endblocktrans %}\r
-        {% endif %}\r
-\r
-        {% blocktrans with question.title as question_title and settings.APP_URL as app_url and question.get_absolute_url as question_url %}\r
-             the question  <a href="{{ app_url }}{{ question_url }}">{{ question_title }}</a>\r
-        {% endblocktrans %}\r
-    </p>\r
-\r
-    <blockquote>\r
-        {{ comment.comment }}\r
-    </blockquote>\r
-\r
-    {% blocktrans %}\r
-        Don't forget to come over and cast your vote.\r
-    {% endblocktrans %}\r
-\r
-    <p>{% blocktrans %}Sincerely,<br />\r
-    Forum Administrator{% endblocktrans %}</p>\r
-{% endblock %}\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 %}