X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/7fb4da9ecca0993ce6d61750739690ab680cab30..67d1c37bf8bb05cf1b3ebebf88b6ac5d3b5b07a2:/forum/skins/default/templates/notifications/digest.html

diff --git a/forum/skins/default/templates/notifications/digest.html b/forum/skins/default/templates/notifications/digest.html
index 99485e7..e986d4b 100644
--- a/forum/skins/default/templates/notifications/digest.html
+++ b/forum/skins/default/templates/notifications/digest.html
@@ -1,7 +1,7 @@
 {% load i18n extra_tags email_tags %}
 
 {% declare %}
-    prefix = settings.EMAIL_SUBJECT_PREFIX
+    prefix = html.mark_safe(settings.EMAIL_SUBJECT_PREFIX)
     app_name = settings.APP_SHORT_NAME
     app_url = settings.APP_URL
 
@@ -14,9 +14,17 @@
     {% subject %}{% blocktrans %}{{ prefix }} Daily digest{% endblocktrans %}{% endsubject %}
 
     {% htmlcontent notifications/base.html %}
-        {% blocktrans %}
-        This is a brief of what's going on the {{ app_name }} community since our last update.
-        {% endblocktrans %}
+        {% declare %}
+            new_questions_link = html.hyperlink(app_url + reverse('questions') + '?sort=' + _('latest'), _('new questions'), style=a_style)
+            user_questions = digest.get_for_user(recipient)
+            subscriptions_link = html.hyperlink(app_url + recipient.get_subscribed_url(), _('subscriptions'), style=a_style)
+        {% enddeclare %}
+
+        <p style="{{ p_style }}">
+            {% blocktrans %}
+            This is a brief of what's going on the {{ app_name }} community since our last update.
+            {% endblocktrans %}
+        </p>                           
 
         {% if new_member_count %}
         <p style="{{ p_style }}">
@@ -34,12 +42,6 @@
 
         {% if new_question_count %}
 
-        {% declare %}
-            new_questions_link = html.hyperlink(app_url + reverse('questions') + '?sort=latest', _('new questions'), style=a_style)
-            user_questions = digest.get_for_user(recipient)
-            subscriptions_link = html.hyperlink(app_url + recipient.get_subscribed_url(), _('subscriptions'), style=a_style)
-        {% enddeclare %}
-
         <p style="{{ p_style }}">
             {% blocktrans %}
             {{ new_question_count }} {{ new_questions_link }} were posted since our last update.
@@ -88,9 +90,56 @@
 
         {% endif %}
 
-    {% endhtmlcontent %}
+        {% if recipient.is_superuser %}
+        {% declare %}
+            flagged_url = html.hyperlink(app_url + reverse('admin_flagged_posts'), str(flagged_count) + ' ' + _('posts'), style=a_style)
+        {% enddeclare %}
+        <p style="{{ p_style }}">
+            {% blocktrans %}
+            {{ flagged_url }} have been marked as flagged.
+            {% endblocktrans %}
+        </p>
+        {% endif %}
 
-    {% textcontent notifications/base_text.html %}
+    {% endhtmlcontent %}
 
-    {% endtextcontent %}
-{% endemail %}
\ No newline at end of file
+{% textcontent notifications/base_text.html %}
+{% blocktrans %}This is a brief of what's going on the {{ app_name }} community since our last update.{% endblocktrans %}
+
+{% if new_member_count %}
+{% if show_all_users %}
+{% blocktrans %}There are {{ new_member_count }} new members in the community. {{ new_member_links }} were the most active so far.{% endblocktrans %}
+{% else %}
+{% blocktrans %}{{ new_member_links }} have joined the {{ app_name }} community.{% endblocktrans %}
+{% endif %}
+{% endif %}
+
+{% if new_question_count %}
+{% blocktrans %}{{ new_question_count }} new questions were posted since our last update.{% endblocktrans %}
+
+{% if user_questions.interesting %}{% trans "We think you might like the following questions:" %}
+{% for q in user_questions.interesting %}
+* {{ q.title }}
+{% endfor %}
+{% endif %}
+
+{% if user_questions.may_help %}
+{% trans "These new questions didn't get many attention from the community, but we think you may be able to help:" %}
+{% for q in user_questions.may_help %}
+* {{ q.title }}
+{% endfor %}
+
+{% if user_questions.subscriptions %}
+{% blocktrans %}Meanwhile, some of your subscriptions have new updates since you last visited them:{% endblocktrans %}
+{% for q in user_questions.subscriptions %}
+* {{ q.title }}
+{% endfor %}
+{% endif %}
+{% endif %}
+{% endif %}
+
+{% if recipient.is_superuser %}
+{% blocktrans %}{{ flagged_count }} posts have been marked as flagged.{% endblocktrans %}
+{% endif %}
+{% endtextcontent %}
+{% endemail %}