Fixes broken questions feed link.

[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 50fe5040708a9f58e574f6e33e2be95f79b516ec..2350185e2a686468a50f4c2dc4991124a75c3632 100644 (file)
--- a/forum/skins/default/templates/notifications/newanswer.html
+++ b/forum/skins/default/templates/notifications/newanswer.html
@@ -1,44 +1,43 @@
-{% 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
-    answer_author = answer.author.username\r
-    question = answer.question\r
-    question_url = question.get_absolute_url()\r
-    question_title = question.title\r
-{% enddeclare %}\r
-\r
-{% email %}\r
-    {% subject %}{% blocktrans %}{{ prefix }} New answer to {{ question_title }}{% endblocktrans %}{% endsubject %}\r
-\r
-    {% htmlcontent notifications/base.html %}\r
-        <p style="{{ p_style }}">\r
-            {% blocktrans %}\r
-            {{ answer_author }} has just posted a new answer on {{ app_name }} 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 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 %}\r
-        {{ answer_author }} has just posted a new answer on {{ app_name }} to the question\r
-            "{{ question_title }}":\r
-        {% endblocktrans %}\r
-\r
-\r
-        {{ answer.body|safe }}\r
-\r
-        {% trans "Don't forget to come over and cast your vote." %} \r
-    {% endtextcontent %}\r
-\r
-{% endemail %}\r
-\r
+{% 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)
+    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 }} 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 {{ app_name }} to the question
+"{{ question_title }}":
+{% endblocktrans %}
+{{ safe_body }}
+
+{% trans "Don't forget to come over and cast your vote." %}
+{% endtextcontent %}
+
+{% endemail %}
+