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

emails: Replace context variable zulip_support with support_email.

Browse Source
This commit is contained in:
Rishi Gupta
2017-06-10 01:27:49 -07:00
parent 15b967fc3e
commit 1d702d13a4
5 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/zerver/emails/notify_new_login.html
View File

@@ -11,7 +11,7 @@
<p>Device: {{ device_info.device_browser if device_info.device_browser else 'An unknown browser' }} on {{ device_info.device_os if device_info.device_os else 'an unknown operating system' }}.</p> <p>Device: {{ device_info.device_browser if device_info.device_browser else 'An unknown browser' }} on {{ device_info.device_os if device_info.device_os else 'an unknown operating system' }}.</p>
<p>IP Address: {{ device_info.device_ip }}</p> <p>IP Address: {{ device_info.device_ip }}</p>
</blockquote> </blockquote>
<p><b>If you do not recognize this login activity or think your account may have been compromised, contact Zulip Support at {{ zulip_support }}.</b></p> <p><b>If you do not recognize this login activity or think your account may have been compromised, contact Zulip Support at {{ support_email }}.</b></p>
<p>If you recognize this login activity, you can archive this notice.</p> <p>If you recognize this login activity, you can archive this notice.</p>
<p>Thanks,<br />Zulip Account Security</p> <p>Thanks,<br />Zulip Account Security</p>
{% endblock %} {% endblock %}

2
templates/zerver/emails/notify_new_login.txt
View File

@@ -11,7 +11,7 @@ Time: {{ device_info.login_time }}
Device: {{ device_info.device_browser if device_info.device_browser else 'an unknown browser' }} on {{ device_info.device_os if device_info.device_os else 'an unknown operating system' }}. Device: {{ device_info.device_browser if device_info.device_browser else 'an unknown browser' }} on {{ device_info.device_os if device_info.device_os else 'an unknown operating system' }}.
IP Address: {{ device_info.device_ip }} IP Address: {{ device_info.device_ip }}
If you do not recognize this login activity, or think your account may have been compromised, contact Zulip Support at {{ zulip_support }}. If you do not recognize this login activity, or think your account may have been compromised, contact Zulip Support at {{ support_email }}.
If you recognize this login activity, you can archive this notice. If you recognize this login activity, you can archive this notice.

1
zerver/signals.py
View File

@@ -82,7 +82,6 @@ def email_on_new_login(sender, user, request, **kwargs):
context = common_context(user) context = common_context(user)
context['device_info'] = device_info context['device_info'] = device_info
context['zulip_support'] = settings.ZULIP_ADMINISTRATOR
context['user'] = user context['user'] = user
send_email_to_user('zerver/emails/notify_new_login', user, context=context) send_email_to_user('zerver/emails/notify_new_login', user, context=context)

1
zerver/tests/test_templates.py
View File

@@ -199,7 +199,6 @@ class TemplateTestCase(ZulipTestCase):
"device_ip": "127.0.0.1", "device_ip": "127.0.0.1",
"login_time": "9:33am NewYork, NewYork", "login_time": "9:33am NewYork, NewYork",
}, },
zulip_support="zulip-admin@example.com",
) )
context.update(kwargs) context.update(kwargs)

1
zerver/views/test_emails.py
View File

@@ -53,7 +53,6 @@ def email_page(request):
'old_email': 'old_address@acme.com', 'old_email': 'old_address@acme.com',
'new_email': 'new_address@acme.com', 'new_email': 'new_address@acme.com',
'activate_url': '%s/accounts/do_confirm/5348720e4af7d2e8f296cbbd04d439489917ddc0' % (settings.SERVER_URI,), 'activate_url': '%s/accounts/do_confirm/5348720e4af7d2e8f296cbbd04d439489917ddc0' % (settings.SERVER_URI,),
'zulip_support': 'support@' + settings.EXTERNAL_HOST,
'unsubscribe_link': '%s/accounts/unsubscribe/<type>/cf88931365ef1b0f12eae8d488bbc7af3563d7f0' % (settings.SERVER_URI,), 'unsubscribe_link': '%s/accounts/unsubscribe/<type>/cf88931365ef1b0f12eae8d488bbc7af3563d7f0' % (settings.SERVER_URI,),
} }