diff --git a/templates/zerver/emails/digest/digest_email.html b/templates/zerver/emails/digest.html similarity index 100% rename from templates/zerver/emails/digest/digest_email.html rename to templates/zerver/emails/digest.html diff --git a/templates/zerver/emails/digest/digest_email.subject b/templates/zerver/emails/digest.subject similarity index 100% rename from templates/zerver/emails/digest/digest_email.subject rename to templates/zerver/emails/digest.subject diff --git a/templates/zerver/emails/digest/digest_email.txt b/templates/zerver/emails/digest.txt similarity index 100% rename from templates/zerver/emails/digest/digest_email.txt rename to templates/zerver/emails/digest.txt diff --git a/tools/check-templates b/tools/check-templates index 43b4ab675e..77b35294bd 100755 --- a/tools/check-templates +++ b/tools/check-templates @@ -162,7 +162,7 @@ def check_html_templates(templates, all_dups): 'templates/zerver/apps.html', 'templates/zerver/accounts_home.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/followup/day1.html', 'templates/zerver/emails/followup/day2.html', diff --git a/zerver/lib/digest.py b/zerver/lib/digest.py index 50ae8029d5..fa4794129f 100644 --- a/zerver/lib/digest.py +++ b/zerver/lib/digest.py @@ -213,11 +213,11 @@ def handle_digest_email(user_profile_id, cutoff): user_profile, cutoff_date) 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( - 'zerver/emails/digest/digest_email.txt', template_payload) + 'zerver/emails/digest.txt', template_payload) 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. if enough_traffic(template_payload["unread_pms"],