X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/58f020d4fab8251103edb89bfc4cf5d5d389d1ad..7fb4da9ecca0993ce6d61750739690ab680cab30:/forum/skins/default/templates/notifications/digest.html?ds=sidebyside

diff --git a/forum/skins/default/templates/notifications/digest.html b/forum/skins/default/templates/notifications/digest.html
index 9a7ec04..99485e7 100644
--- a/forum/skins/default/templates/notifications/digest.html
+++ b/forum/skins/default/templates/notifications/digest.html
@@ -1,79 +1,96 @@
-{% extends "email_base.html" %}
-{% load i18n %}
-{% load humanize %}
-{% load extra_tags %}
-
-{% block content %}
-    <p>{% trans "Hello" %} {{ user.username }},</p>
-
-    <p>{% blocktrans with settings.APP_SHORT_NAME as app_title %}
-    This is the {{ digest_type }} activity digest for {{ app_title }}
-    {% endblocktrans %}</p>
-
-    {% if new_users %}
-        <h3>
-        {% blocktrans with new_users|length as nusers_count and new_users|length|pluralize as nusers_count_pluralize and settings.APP_SHORT_NAME as app_title %}
-            {{ nusers_count }} new user{{ nusers_count_pluralize }} joined the {{ app_title }} community:
+{% load i18n extra_tags email_tags %}
+
+{% declare %}
+    prefix = settings.EMAIL_SUBJECT_PREFIX
+    app_name = settings.APP_SHORT_NAME
+    app_url = settings.APP_URL
+
+    new_member_links = html.mark_safe(", ".join([html.objlink(u, style=settings.EMAIL_ANCHOR_STYLE) for u in new_members]))
+    new_question_count = digest.count
+
+{% enddeclare %}
+
+{% email %}
+    {% 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 %}
+
+        {% if new_member_count %}
+        <p style="{{ p_style }}">
+        {% 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 %}
-        </h3>
+        {% else %}
+        {% blocktrans %}
+            {{ new_member_links }} have joined the {{ app_name }} community.
+        {% endblocktrans %}
+        {% endif %}
+        {% endif %}
+        </p>
+
+        {% 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.
+            {% endblocktrans %}
+        </p>
+
+        {% if user_questions.interesting %}
+        <p style="{{ p_style }}">
+            {% trans "We think you might like the following questions:" %}
+        </p>
         <ul>
-        {% for nuser in new_users %}
-            <li><a href="{{ settings.APP_URL }}{{ nuser.get_profile_url }}">{{ nuser.username }}</a></li>        
+        {% for q in user_questions.interesting %}
+            <li>
+                <a style="{{ a_style }}" href="{{ app_url }}{{ q.get_absolute_url  }}">{{ q.title }}</a>
+            </li>
         {% endfor %}
         </ul>
-    {% endif %}
+        {% endif %}
 
-    {% if activity_in_subscriptions %}
-        <h3>
-        {% blocktrans with activity_in_subscriptions|length as question_count and activity_in_subscriptions|length|pluralize as question_count_pluralize %}
-            {{ question_count }} of your subscriptions have updates:
-        {% endblocktrans %}
-        </h3>
+        {% if user_questions.may_help %}
+        <p style="{{ p_style }}">
+            {% trans "These new questions didn't get many attention from the community, but we think you may be able to help:" %}
+        </p>
         <ul>
-        {% for record in activity_in_subscriptions %}
+        {% for q in user_questions.may_help %}
             <li>
-            {% trans "On question " %}<a href="{{ settings.APP_URL }}{{ record.question.get_absolute_url }}">{{ question_title }}" %}</a> -
-            {% if record.activity.answers %}
-                {% blocktrans with record.activity.answers|length as answer_count and record.activity.answers|length|pluralize as answer_count_pluralize %}
-                    {{ answer_count }} new answer{{ answer_count_pluralize }}
-                {% endblocktrans %},
-            {% endif %}
-            {% if record.activity.comments %}
-                {% blocktrans with record.activity.comments|length as comment_count and record.activity.comments|length|pluralize as comment_count_pluralize %}
-                    {{ comment_count }} new comment{{ comment_count_pluralize }}
-                {% endblocktrans %}
-                {% if own_comments_only %}
-                    {% trans "on your own post(s)" %}
-                {% endif %},
-            {% endif %}
-            {% if record.accepted %}
-                {% trans "an answer was accepted" %}
-            {% endif %}
+                <a style="{{ a_style }}" href="{{ app_url }}{{ q.get_absolute_url  }}">{{ q.title }}</a>
             </li>
         {% endfor %}
         </ul>
-    {% endif %}
 
-    {% if new_questions %}
-        <h3>
-        {% blocktrans with new_questions|length as question_count and new_questions|length|pluralize as question_count_pluralize%}
-            {{ question_count }} new question{{ question_count_pluralize }}
-        {% endblocktrans %}
-        {% if watched_tags_only %}
-            {% trans "matching your interesting tags" %}
-        {% endif %}
-        {% trans "posted :" %}
-        </h3>
+        {% if user_questions.subscriptions %}
+        <p style="{{ p_style }}">
+            {% blocktrans %}Meanwhile, some of your {{ subscriptions_link }} have new updates since you last visited them:{% endblocktrans %}
+        </p>
         <ul>
-        {% for question in new_questions %}
+        {% for q in user_questions.subscriptions %}
             <li>
-                <a href="{{ settings.APP_URL }}{{ question.get_absolute_url }}">{{ question.title }}</a> -
-                {% blocktrans with question.author.username as author_name and question.added_at|date:"D d M Y" as question_time %}
-                    Posted by {{ author_name }} in {{ question_time }}
-                {% endblocktrans %}
+                <a style="{{ a_style }}" href="{{ app_url }}{{ q.get_absolute_url  }}">{{ q.title }}</a>
             </li>
         {% endfor %}
         </ul>
-    {% endif %}
+        {% endif %}
+        
+        {% endif %}
+
+        {% endif %}
+
+    {% endhtmlcontent %}
+
+    {% textcontent notifications/base_text.html %}
 
-{% endblock %}
\ No newline at end of file
+    {% endtextcontent %}
+{% endemail %}
\ No newline at end of file