Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

email: Move and rename emailchangestatus_confirmation_email templates.

This commit is contained in:
Rishi Gupta 2017-05-01 11:28:42 -07:00
parent 0a32d9efa3
commit 235abe0b72
6 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
templates/confirmation/emailchangestatus_confirmation_email.html → templates/zerver/emails/confirm_new_email.html
View File

0
templates/confirmation/emailchangestatus_confirmation_email.subject → templates/zerver/emails/confirm_new_email.subject
View File

0
templates/confirmation/emailchangestatus_confirmation_email.txt → templates/zerver/emails/confirm_new_email.txt
View File

2
tools/check-templates
View File

@ -153,7 +153,7 @@ def check_html_templates(templates, all_dups):
'templates/analytics/stats.html', 'templates/analytics/stats.html',
'templates/confirmation/confirm.html', 'templates/confirmation/confirm.html',
'templates/confirmation/confirm_email_change.html', 'templates/confirmation/confirm_email_change.html',
'templates/confirmation/emailchangestatus_confirmation_email.html', 'templates/zerver/emails/confirm_new_email.html',
'templates/confirmation/invite_email.html', 'templates/confirmation/invite_email.html',
'templates/confirmation/preregistrationuser_confirmation_email.html', 'templates/confirmation/preregistrationuser_confirmation_email.html',
'templates/corporate/zephyr-mirror.html', 'templates/corporate/zephyr-mirror.html',

2
zerver/lib/actions.py
View File

@ -623,7 +623,7 @@ def do_start_email_change_process(user_profile, new_email):
realm=user_profile.realm) realm=user_profile.realm)
EmailChangeConfirmation.objects.send_confirmation( EmailChangeConfirmation.objects.send_confirmation(
obj, 'confirmation/emailchangestatus_confirmation_email', new_email, obj, 'zerver/emails/confirm_new_email', new_email,
additional_context=context, additional_context=context,
host=user_profile.realm.host, host=user_profile.realm.host,
) )

6
zerver/tests/test_templates.py
View File

@ -87,9 +87,9 @@ class TemplateTestCase(ZulipTestCase):
'confirmation/mituser_confirmation_email.subject', 'confirmation/mituser_confirmation_email.subject',
'confirmation/mituser_invite_email.txt', 'confirmation/mituser_invite_email.txt',
'confirmation/mituser_invite_email.subject', 'confirmation/mituser_invite_email.subject',
'confirmation/emailchangestatus_confirmation_email.subject', 'zerver/emails/confirm_new_email.subject',
'confirmation/emailchangestatus_confirmation_email.html', 'zerver/emails/confirm_new_email.html',
'confirmation/emailchangestatus_confirmation_email.txt', 'zerver/emails/confirm_new_email.txt',
'confirmation/notify_change_in_email.subject', 'confirmation/notify_change_in_email.subject',
'corporate/mit.html', 'corporate/mit.html',
'corporate/zephyr.html', 'corporate/zephyr.html',