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

confirmation: Remove references to confirmation_email.* templates. 

These look like they were intended to be generic, fallback templates for the
confirmation flow, but were never written.
This commit is contained in:
Rishi Gupta 2017-04-29 11:29:58 -07:00
parent 4027adb6cc
commit 965c9160ad
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
confirmation/models.py
View File

@ -112,23 +112,15 @@ class ConfirmationManager(models.Manager):
template_name = "mituser"
else:
template_name = obj._meta.model_name
templates = [
'confirmation/%s_confirmation_email.subject' % (template_name,),
'confirmation/confirmation_email.subject',
]
if subject_template_path:
template = loader.get_template(subject_template_path)
else:
template = loader.select_template(templates)
template = loader.select_template('confirmation/%s_confirmation_email.subject' % (template_name,))
subject = template.render(context).strip().replace(u'\n', u' ') # no newlines, please
templates = [
'confirmation/%s_confirmation_email.txt' % (template_name,),
'confirmation/confirmation_email.txt',
]
if body_template_path:
template = loader.get_template(body_template_path)
else:
template = loader.select_template(templates)
template = loader.select_template('confirmation/%s_confirmation_email.txt' % (template_name,))
if html_body_template_path:
html_template = loader.get_template(html_body_template_path)
else: