paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 21:43:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

email: Move and rename find_team_email templates.

Browse Source
This commit is contained in:
Rishi Gupta
2017-05-01 14:52:41 -07:00
committed by Tim Abbott
parent ebfae36494
commit 21a6377204
5 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
templates/zerver/emails/find_team/find_team_email.html → templates/zerver/emails/find_team.html
View File

0
templates/zerver/emails/find_team/find_team_email.subject → templates/zerver/emails/find_team.subject
View File

0
templates/zerver/emails/find_team/find_team_email.txt → templates/zerver/emails/find_team.txt
View File

2
tools/check-templates
View File

@@ -163,7 +163,7 @@ def check_html_templates(templates, all_dups):
'templates/zerver/accounts_home.html', 'templates/zerver/accounts_home.html',
'templates/zerver/compose.html', 'templates/zerver/compose.html',
'templates/zerver/emails/digest.html', 'templates/zerver/emails/digest.html',
'templates/zerver/emails/find_team/find_team_email.html', 'templates/zerver/emails/find_team.html',
'templates/zerver/emails/followup/day1.html', 'templates/zerver/emails/followup/day1.html',
'templates/zerver/emails/followup/day2.html', 'templates/zerver/emails/followup/day2.html',
'templates/zerver/emails/invitation_reminder.html', 'templates/zerver/emails/invitation_reminder.html',

8
zerver/views/registration.py
View File

@@ -385,14 +385,12 @@ def generate_204(request):
def send_find_my_team_emails(user_profile): def send_find_my_team_emails(user_profile):
# type: (UserProfile) -> None # type: (UserProfile) -> None
text_template = 'zerver/emails/find_team/find_team_email.txt'
html_template = 'zerver/emails/find_team/find_team_email.html'
context = {'user_profile': user_profile} context = {'user_profile': user_profile}
text_content = loader.render_to_string(text_template, context) text_content = loader.render_to_string('zerver/emails/find_team.txt', context)
html_content = loader.render_to_string(html_template, context) html_content = loader.render_to_string('zerver/emails/find_team.html', context)
sender = settings.NOREPLY_EMAIL_ADDRESS sender = settings.NOREPLY_EMAIL_ADDRESS
recipients = [user_profile.email] recipients = [user_profile.email]
subject = loader.render_to_string('zerver/emails/find_team/find_team_email.subject').strip() subject = loader.render_to_string('zerver/emails/find_team.subject').strip()
send_mail(subject, text_content, sender, recipients, html_message=html_content) send_mail(subject, text_content, sender, recipients, html_message=html_content)