X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/5960a749b88d64b2d0587e090d3f47be554d4f9d..77c7fb49881b1df98ce3584468105ba78740fd48:/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 043a24d..9963a46 100644 --- a/forum/skins/default/templates/notifications/newcomment.html +++ b/forum/skins/default/templates/notifications/newcomment.html @@ -1,25 +1,22 @@ {% load i18n extra_tags email_tags %} {% declare %} - prefix = settings.EMAIL_SUBJECT_PREFIX - app_name = settings.APP_SHORT_NAME + prefix = html.mark_safe(settings.EMAIL_SUBJECT_PREFIX) 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() + 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 %} + {% subject %}{% blocktrans %}{{ prefix }} New comment on: {{ question_title }}{% endblocktrans %}{% endsubject %} {% htmlcontent notifications/base.html %} - {% declare %} - author_link = html.objlink(comment.author, style=a_style) - question_link = html.objlink(question, style=a_style) - {% enddeclare %}

{% blocktrans %}{{ author_link }} has just posted a comment on {% endblocktrans %} {% ifnotequal post question %} @@ -38,7 +35,7 @@ {% 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 %} +{% blocktrans %}the answer posted by {{ safe_post_author }} to {% endblocktrans %} {% endifnotequal %} {% blocktrans %}the question "{{ question_title }}"{% endblocktrans %} {{ safe_body }}