From: jordan <jordan@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Sun, 27 Mar 2011 19:02:33 +0000 (+0000)
Subject: #OSQA-585, adding support for plain text emails for the daily digest.
X-Git-Tag: live~395
X-Git-Url: https://git.openstreetmap.org./osqa.git/commitdiff_plain/2cc473d49594f6d9856e5ec3ea18818230fd5eab

#OSQA-585, adding support for plain text emails for the daily digest.

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@901 0cfe37f9-358a-4d5e-be75-b63607b5c754
---

diff --git a/forum/skins/default/templates/notifications/digest.html b/forum/skins/default/templates/notifications/digest.html
index 0c01f60..e986d4b 100644
--- a/forum/skins/default/templates/notifications/digest.html
+++ b/forum/skins/default/templates/notifications/digest.html
@@ -14,6 +14,12 @@
     {% subject %}{% blocktrans %}{{ prefix }} Daily digest{% endblocktrans %}{% endsubject %}
 
     {% htmlcontent notifications/base.html %}
+        {% 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.
@@ -36,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.
@@ -103,7 +103,43 @@
 
     {% endhtmlcontent %}
 
-    {% textcontent notifications/base_text.html %}
-
-    {% endtextcontent %}
+{% 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 %}