X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/1a949f7c97dc2f34c135f5cdf088df2927d3d652..5c7287b435f2e68257bce3b76ee435d9b07f87f9:/forum/skins/default/templates/notifications/newcomment.html?ds=sidebyside

diff --git a/forum/skins/default/templates/notifications/newcomment.html b/forum/skins/default/templates/notifications/newcomment.html
index 30e3c65..fbb9513 100644
--- a/forum/skins/default/templates/notifications/newcomment.html
+++ b/forum/skins/default/templates/notifications/newcomment.html
@@ -1,34 +1,47 @@
-{% extends "email_base.html" %}
-{% load i18n %}
-{% load extra_tags %}
-
-{% block content %}
-    <p>{% trans "Hello" %} {% user_var username %},</p>
-
-    <p>
-        {% blocktrans with comment.user.username as author_name %}
-            {{ author_name }} has just posted a comment on
-        {% endblocktrans %}
-
-        {% if post.question %}
-            {% blocktrans with settings.APP_URL as app_url and post.author.username as poster_name and post.author.get_profile_url as poster_url%}
-                the answer posted by <a href="{{ app_url }}{{ poster_url }}">{{ poster_name }}</a> to
-            {% endblocktrans %}
-        {% endif %}
-
-        {% blocktrans with question.title as question_title and settings.APP_URL as app_url and question.get_absolute_url as question_url %}
-             the question  <a href="{{ app_url }}{{ question_url }}">{{ question_title }}</a>
-        {% endblocktrans %}
-    </p>
-
-    <blockquote>
-        {{ comment.comment }}
-    </blockquote>
-
-    {% blocktrans %}
-        Don't forget to come over and cast your vote.
-    {% endblocktrans %}
-
-    <p>{% blocktrans %}Sincerely,<br />
-    Forum Administrator{% endblocktrans %}</p>
-{% endblock %}
+{% 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)
+    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 {{ 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 %}