diff --git a/templates/confirmation/invite_email.html b/templates/zerver/emails/invitation.html similarity index 100% rename from templates/confirmation/invite_email.html rename to templates/zerver/emails/invitation.html diff --git a/templates/confirmation/invite_email.subject b/templates/zerver/emails/invitation.subject similarity index 100% rename from templates/confirmation/invite_email.subject rename to templates/zerver/emails/invitation.subject diff --git a/templates/confirmation/invite_email.txt b/templates/zerver/emails/invitation.txt similarity index 100% rename from templates/confirmation/invite_email.txt rename to templates/zerver/emails/invitation.txt diff --git a/tools/check-templates b/tools/check-templates index 69b1f71763..b6cd70bafd 100755 --- a/tools/check-templates +++ b/tools/check-templates @@ -154,7 +154,7 @@ def check_html_templates(templates, all_dups): 'templates/confirmation/confirm.html', 'templates/confirmation/confirm_email_change.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/corporate/zephyr-mirror.html', 'templates/corporate/zephyr.html', diff --git a/zerver/lib/actions.py b/zerver/lib/actions.py index 7cad25edef..a3e35c3bfa 100644 --- a/zerver/lib/actions.py +++ b/zerver/lib/actions.py @@ -3064,7 +3064,7 @@ def do_send_confirmation_email(invitee, referrer, body): if referrer.realm.is_zephyr_mirror_realm: template_prefix = 'confirmation/mituser_invite_email' else: - template_prefix = 'confirmation/invite_email' + template_prefix = 'zerver/emails/invitation' Confirmation.objects.send_confirmation( invitee, template_prefix, invitee.email, additional_context=context,