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

diff --git a/forum/skins/default/templates/notifications/answeraccepted.html b/forum/skins/default/templates/notifications/answeraccepted.html
index 367a67f..5157bd0 100644
--- a/forum/skins/default/templates/notifications/answeraccepted.html
+++ b/forum/skins/default/templates/notifications/answeraccepted.html
@@ -1,33 +1,33 @@
-{% 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
-    accepted_by = answer.nstate.accepted.by.username
-{% enddeclare %}
-
-{% email %}
-    {% subject %}{% blocktrans %}{{ prefix }} New answer to {{ question_title }}{% endblocktrans %}{% endsubject %}
-
-    {% htmlcontent notifications/base.html %}
-        <p style="{{ p_style }}">
-            {% blocktrans %}
-            {{ accepted_by }} has just accepted {{ answer_author }}'s answer on his question
-            <a href="{{ app_url }}{{ question_url }}">{{ question_title }}</a>.
-            {% 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 %}
+{% load i18n extra_tags email_tags %}
+
+{% declare %}
+    prefix = html.mark_safe(smart_str(settings.EMAIL_SUBJECT_PREFIX))
+    answer_author = html.mark_safe(smart_str(answer.author.username))
+    question = answer.question
+    question_title = html.mark_safe(smart_str(question.title))
+    accepted_by = html.mark_safe(smart_str(answer.nstate.accepted.by.username))
+    accepted_by_link = html.objlink(answer.nstate.accepted.by, style=settings.EMAIL_ANCHOR_STYLE)
+    answer_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 }} An answer to: {{ question_title }} has been accepted{% endblocktrans %}{% endsubject %}
+
+    {% htmlcontent notifications/base.html %}
+        <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 %}