X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/3522ca5472c0496b3dba563d2e590d724257b16a..5960a749b88d64b2d0587e090d3f47be554d4f9d:/forum/skins/default/templates/notifications/answeraccepted.html

diff --git a/forum/skins/default/templates/notifications/answeraccepted.html b/forum/skins/default/templates/notifications/answeraccepted.html
index 504970b..7170a5d 100644
--- a/forum/skins/default/templates/notifications/answeraccepted.html
+++ b/forum/skins/default/templates/notifications/answeraccepted.html
@@ -1,17 +1,36 @@
-{% extends "email_base.html" %}
-{% load i18n %}
-{% load extra_tags %}
-
-{% block content %}
-    <p>{% trans "Hello" %} {% user_var username %},</p>
-
-    <p>
-        {% blocktrans with answer.accepted.by.username as accepter and answer.author.username as answer_author and settings.APP_SHORT_NAME as app_title and settings.APP_URL as app_url and question.get_absolute_url as question_url and question.title as question_title %}
-        Just to let you know that {{ accepter }} has just accepted {{ answer_author }}'s answer on his question
-        <a href="{{ app_url }}{{ question_url }}">{{ question_title }}</a>:
-        {% endblocktrans %}
-    </p>
-
-    <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
+    answer_author = answer.author.username
+    question = answer.question
+    question_title = html.mark_safe(question.title)
+    accepted_by = answer.nstate.accepted.by.username
+{% enddeclare %}
+
+{% email %}
+    {% subject %}{% blocktrans %}{{ prefix }} New answer to {{ question_title }}{% endblocktrans %}{% endsubject %}
+
+    {% htmlcontent notifications/base.html %}
+        {% declare %}
+            accepted_by_link = html.objlink(answer.nstate.accepted.by, style=a_style)
+            answer_author_link = html.objlink(answer.author, style=a_style)
+            question_link = html.objlink(question, style=a_style)
+        {% enddeclare %}
+        <p style="{{ p_style }}">
+            {% blocktrans %}
+            {{ accepted_by_link }} has just accepted {{ answer_author_link }}'s answer on his question
+            {{ question_link }}.
+            {% endblocktrans %}
+        </p>
+    {% endhtmlcontent %}
+
+{% textcontent notifications/base_text.html %}
+{% blocktrans %}
+{{ accepted_by }} has just accepted {{ answer_author }}'s answer on his question
+"{{ question_title }}".
+{% endblocktrans %}
+{% endtextcontent %}
+
+{% endemail %}