X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/d0c5ac2cb8bee88ff425ecbb3db3921c4e83ea18..483162a72bfe820b11db05c384c0fc6103d084cf:/forum/skins/default/templates/notifications/newcomment.html?ds=inline

diff --git a/forum/skins/default/templates/notifications/newcomment.html b/forum/skins/default/templates/notifications/newcomment.html
index 6d59f1b..9963a46 100644
--- a/forum/skins/default/templates/notifications/newcomment.html
+++ b/forum/skins/default/templates/notifications/newcomment.html
@@ -1,47 +1,46 @@
-{% load i18n extra_tags email_tags %}
-
-{% declare %}
-    prefix = settings.EMAIL_SUBJECT_PREFIX
-    app_name = settings.APP_SHORT_NAME
-    app_url = settings.APP_URL
-    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 = question.title
-{% enddeclare %}
-
-{% email %}
-    {% subject %}{% blocktrans %}{{ prefix }} New comment on {{ question_title }}{% endblocktrans %}{% endsubject %}
-
-    {% htmlcontent notifications/base.html %}
-        <p style="{{ p_style }}">
-            {% 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 <a href="{{ app_url }}{{ question_url }}">{{ question_title }}</a>{% 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 %}
-
-
-        {{ comment.body }}
-
-        {% trans "Don't forget to come over and cast your vote." %}
-    {% endtextcontent %}
-
-{% endemail %}
+{% load i18n extra_tags email_tags %}
+
+{% declare %}
+    prefix = html.mark_safe(settings.EMAIL_SUBJECT_PREFIX)
+    post = comment.parent
+    question = post.question and post.question or post
+    post_author = post.author.username
+    safe_post_author = html.mark_safe(post.author.username)
+    comment_author = html.mark_safe(comment.author)
+    question_title = html.mark_safe(question.title)
+    safe_body = html.html2text(comment.comment)
+    author_link = html.objlink(comment.author, style=settings.EMAIL_ANCHOR_STYLE)
+    question_link = html.objlink(question, style=settings.EMAIL_ANCHOR_STYLE)
+{% enddeclare %}
+
+{% email %}
+    {% subject %}{% blocktrans %}{{ prefix }} New comment on: {{ question_title }}{% endblocktrans %}{% endsubject %}
+
+    {% htmlcontent notifications/base.html %}
+        <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 {{ safe_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 %}