X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/d0c5ac2cb8bee88ff425ecbb3db3921c4e83ea18..dd39500e2215a69a29589e89add8127cfba2ca84:/forum/skins/default/templates/notifications/newanswer.html?ds=sidebyside

diff --git a/forum/skins/default/templates/notifications/newanswer.html b/forum/skins/default/templates/notifications/newanswer.html
index 50fe504..2350185 100644
--- 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 %}
-
-{% declare %}
-    prefix = settings.EMAIL_SUBJECT_PREFIX
-    app_name = settings.APP_SHORT_NAME
-    app_url = settings.APP_URL
-    answer_author = answer.author.username
-    question = answer.question
-    question_url = question.get_absolute_url()
-    question_title = question.title
-{% enddeclare %}
-
-{% email %}
-    {% subject %}{% blocktrans %}{{ prefix }} New answer to {{ question_title }}{% endblocktrans %}{% endsubject %}
-
-    {% htmlcontent notifications/base.html %}
-        <p style="{{ p_style }}">
-            {% blocktrans %}
-            {{ answer_author }} has just posted a new answer on {{ app_name }} to the question
-            <a href="{{ app_url }}{{ question_url }}">{{ question_title }}</a>:
-            {% 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 %}
-
-
-        {{ answer.body|safe }}
-
-        {% trans "Don't forget to come over and cast your vote." %} 
-    {% endtextcontent %}
-
-{% endemail %}
-
+{% 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 %}
+