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

email: Move and rename mituser_confirmation_email templates.

This commit is contained in:
Rishi Gupta 2017-05-01 11:34:59 -07:00
parent 235abe0b72
commit aa21012783
4 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
templates/confirmation/mituser_confirmation_email.subject → templates/zerver/emails/confirm_registration_mit.subject
View File

0
templates/confirmation/mituser_confirmation_email.txt → templates/zerver/emails/confirm_registration_mit.txt
View File

4
zerver/tests/test_templates.py
View File

@ -83,8 +83,8 @@ class TemplateTestCase(ZulipTestCase):
'zerver/message_history.html',
]
unusual = [
'confirmation/mituser_confirmation_email.txt',
'confirmation/mituser_confirmation_email.subject',
'zerver/emails/confirm_registration_mit.txt',
'zerver/emails/confirm_registration_mit.subject',
'confirmation/mituser_invite_email.txt',
'confirmation/mituser_invite_email.subject',
'zerver/emails/confirm_new_email.subject',

2
zerver/views/registration.py
View File

@ -294,7 +294,7 @@ def send_registration_completion_email(email, request, realm_creation=False):
if settings.REALMS_HAVE_SUBDOMAINS:
realm = get_realm(get_subdomain(request))
if realm and realm.is_zephyr_mirror_realm:
template_prefix = 'confirmation/mituser_confirmation_email'
template_prefix = 'zerver/emails/confirm_registration_mit'
prereg_user = create_preregistration_user(email, request, realm_creation)
context = {'support_email': settings.ZULIP_ADMINISTRATOR,