paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 06:23:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

email: Move and rename invite_email templates.

Browse Source
This commit is contained in:
Rishi Gupta
2017-05-01 11:38:17 -07:00
parent ed0c310aa3
commit 713303deff
5 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
templates/confirmation/invite_email.html → templates/zerver/emails/invitation.html
View File

0
templates/confirmation/invite_email.subject → templates/zerver/emails/invitation.subject
View File

0
templates/confirmation/invite_email.txt → templates/zerver/emails/invitation.txt
View File

2
tools/check-templates
View File

@@ -154,7 +154,7 @@ def check_html_templates(templates, all_dups):
'templates/confirmation/confirm.html', 'templates/confirmation/confirm.html',
'templates/confirmation/confirm_email_change.html', 'templates/confirmation/confirm_email_change.html',
'templates/zerver/emails/confirm_new_email.html', 'templates/zerver/emails/confirm_new_email.html',
'templates/confirmation/invite_email.html', 'templates/zerver/emails/invitation.html',
'templates/zerver/emails/confirm_registration.html', 'templates/zerver/emails/confirm_registration.html',
'templates/corporate/zephyr-mirror.html', 'templates/corporate/zephyr-mirror.html',
'templates/corporate/zephyr.html', 'templates/corporate/zephyr.html',

2
zerver/lib/actions.py
View File

@@ -3064,7 +3064,7 @@ def do_send_confirmation_email(invitee, referrer, body):
if referrer.realm.is_zephyr_mirror_realm: if referrer.realm.is_zephyr_mirror_realm:
template_prefix = 'confirmation/mituser_invite_email' template_prefix = 'confirmation/mituser_invite_email'
else: else:
template_prefix = 'confirmation/invite_email' template_prefix = 'zerver/emails/invitation'
Confirmation.objects.send_confirmation( Confirmation.objects.send_confirmation(
invitee, template_prefix, invitee.email, additional_context=context, invitee, template_prefix, invitee.email, additional_context=context,