email: Move and rename emailchangestatus_confirmation_email templates.

tools/check-templates

@@ -153,7 +153,7 @@ def check_html_templates(templates, all_dups):
         'templates/analytics/stats.html',
         'templates/confirmation/confirm.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/preregistrationuser_confirmation_email.html',
         'templates/corporate/zephyr-mirror.html',

zerver/lib/actions.py

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

zerver/tests/test_templates.py

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