paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-16 11:52:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

email: Move and rename digest_email templates.

Browse Source
This commit is contained in:
Rishi Gupta
2017-05-01 14:47:49 -07:00
committed by Tim Abbott
parent a1f0c1d6ac
commit ebfae36494
5 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
templates/zerver/emails/digest/digest_email.html → templates/zerver/emails/digest.html
View File

0
templates/zerver/emails/digest/digest_email.subject → templates/zerver/emails/digest.subject
View File

0
templates/zerver/emails/digest/digest_email.txt → templates/zerver/emails/digest.txt
View File

2
tools/check-templates
View File

@@ -162,7 +162,7 @@ def check_html_templates(templates, all_dups):
'templates/zerver/apps.html', 'templates/zerver/apps.html',
'templates/zerver/accounts_home.html', 'templates/zerver/accounts_home.html',
'templates/zerver/compose.html', 'templates/zerver/compose.html',
'templates/zerver/emails/digest/digest_email.html', 'templates/zerver/emails/digest.html',
'templates/zerver/emails/find_team/find_team_email.html', 'templates/zerver/emails/find_team/find_team_email.html',
'templates/zerver/emails/followup/day1.html', 'templates/zerver/emails/followup/day1.html',
'templates/zerver/emails/followup/day2.html', 'templates/zerver/emails/followup/day2.html',

6
zerver/lib/digest.py
View File

@@ -213,11 +213,11 @@ def handle_digest_email(user_profile_id, cutoff):
user_profile, cutoff_date) user_profile, cutoff_date)
template_payload["new_users"] = new_users template_payload["new_users"] = new_users
subject = loader.render_to_string('zerver/emails/digest/digest_email.subject').strip() subject = loader.render_to_string('zerver/emails/digest.subject').strip()
text_content = loader.render_to_string( text_content = loader.render_to_string(
'zerver/emails/digest/digest_email.txt', template_payload) 'zerver/emails/digest.txt', template_payload)
html_content = loader.render_to_string( html_content = loader.render_to_string(
'zerver/emails/digest/digest_email.html', template_payload) 'zerver/emails/digest.html', template_payload)
# We don't want to send emails containing almost no information. # We don't want to send emails containing almost no information.
if enough_traffic(template_payload["unread_pms"], if enough_traffic(template_payload["unread_pms"],