paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-09 16:37:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

emails: Fix subject -> email_subject in send_email.py.

Browse Source
This commit is contained in:
Steve Howell
2018-12-23 18:09:04 +00:00
committed by Tim Abbott
parent 4da28efc90
commit b4bc6b4445
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/linter_lib/custom_check.py
View File

@@ -30,7 +30,6 @@ FILES_WITH_LEGACY_SUBJECT = {
# probably always be exempt: # probably always be exempt:
'zerver/lib/email_mirror.py', 'zerver/lib/email_mirror.py',
'zerver/lib/feedback.py', 'zerver/lib/feedback.py',
'zerver/lib/send_email.py',
'zerver/tests/test_new_users.py', 'zerver/tests/test_new_users.py',
# These are tied more to our API than our DB model. # These are tied more to our API than our DB model.

14
zerver/lib/send_email.py
View File

@@ -57,9 +57,9 @@ def build_email(template_prefix: str, to_user_ids: Optional[List[int]]=None,
}) })
def render_templates() -> Tuple[str, str, str]: def render_templates() -> Tuple[str, str, str]:
subject = loader.render_to_string(template_prefix + '.subject.txt', email_subject = loader.render_to_string(template_prefix + '.subject.txt',
context=context, context=context,
using='Jinja2_plaintext').strip().replace('\n', '') using='Jinja2_plaintext').strip().replace('\n', '')
message = loader.render_to_string(template_prefix + '.txt', message = loader.render_to_string(template_prefix + '.txt',
context=context, using='Jinja2_plaintext') context=context, using='Jinja2_plaintext')
@@ -70,16 +70,16 @@ def build_email(template_prefix: str, to_user_ids: Optional[List[int]]=None,
template = os.path.basename(template_prefix) template = os.path.basename(template_prefix)
compiled_template_prefix = os.path.join(emails_dir, "compiled", template) compiled_template_prefix = os.path.join(emails_dir, "compiled", template)
html_message = loader.render_to_string(compiled_template_prefix + '.html', context) html_message = loader.render_to_string(compiled_template_prefix + '.html', context)
return (html_message, message, subject) return (html_message, message, email_subject)
if not language and to_user_ids is not None: if not language and to_user_ids is not None:
language = to_users[0].default_language language = to_users[0].default_language
if language: if language:
with override_language(language): with override_language(language):
# Make sure that we render the email using the target's native language # Make sure that we render the email using the target's native language
(html_message, message, subject) = render_templates() (html_message, message, email_subject) = render_templates()
else: else:
(html_message, message, subject) = render_templates() (html_message, message, email_subject) = render_templates()
logger.warning("Missing language for email template '{}'".format(template_prefix)) logger.warning("Missing language for email template '{}'".format(template_prefix))
if from_name is None: if from_name is None:
@@ -96,7 +96,7 @@ def build_email(template_prefix: str, to_user_ids: Optional[List[int]]=None,
elif from_address == FromAddress.NOREPLY: elif from_address == FromAddress.NOREPLY:
reply_to = [FromAddress.NOREPLY] reply_to = [FromAddress.NOREPLY]
mail = EmailMultiAlternatives(subject, message, from_email, to_emails, reply_to=reply_to) mail = EmailMultiAlternatives(email_subject, message, from_email, to_emails, reply_to=reply_to)
if html_message is not None: if html_message is not None:
mail.attach_alternative(html_message, 'text/html') mail.attach_alternative(html_message, 'text/html')
return mail return mail