email: Move and rename preregistrationuser_confirmation_email templates.

JimGomez48 · May 4, 2017 · ed0c310 · ed0c310
1 parent aa21012
commit ed0c310
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 2 deletions.
diff --git a/...eregistrationuser_confirmation_email.html → ...s/zerver/emails/confirm_registration.html b/...eregistrationuser_confirmation_email.html → ...s/zerver/emails/confirm_registration.html
diff --git a/...gistrationuser_confirmation_email.subject → ...erver/emails/confirm_registration.subject b/...gistrationuser_confirmation_email.subject → ...erver/emails/confirm_registration.subject
diff --git a/...reregistrationuser_confirmation_email.txt → ...es/zerver/emails/confirm_registration.txt b/...reregistrationuser_confirmation_email.txt → ...es/zerver/emails/confirm_registration.txt
diff --git a/tools/check-templates b/tools/check-templates
@@ -155,7 +155,7 @@ def check_html_templates(templates, all_dups):
         'templates/confirmation/confirm_email_change.html',
         'templates/zerver/emails/confirm_new_email.html',
         'templates/confirmation/invite_email.html',
-        'templates/confirmation/preregistrationuser_confirmation_email.html',
+        'templates/zerver/emails/confirm_registration.html',
         'templates/corporate/zephyr-mirror.html',
         'templates/corporate/zephyr.html',
         'templates/zerver/api.html',

diff --git a/zerver/views/registration.py b/zerver/views/registration.py
@@ -286,7 +286,7 @@ def send_registration_completion_email(email, request, realm_creation=False):
     Send an email with a confirmation link to the provided e-mail so the user
     can complete their registration.
     """
-    template_prefix = 'confirmation/preregistrationuser_confirmation_email'
+    template_prefix = 'zerver/emails/confirm_registration'
     # Note: to make the following work in the non-subdomains case, you'll
     # need to copy the logic from the beginning of accounts_register to
     # figure out which realm the user is trying to sign up for, and then