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

fixup day1/day2 email templates 

(imported from commit 30846fc298d04ac763025e82a60731d158840462)
This commit is contained in:
acrefoot 2013-11-15 21:27:59 -05:00
parent 1a904185f2
commit bafb6f8dc3
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/zerver/emails/followup/day1.html
View File

@ -39,7 +39,7 @@ def fn(arg):
<li>Emoji. Because <pre style="display:inline; color:#D14; padding:2px 4px; background-color:#f5f5f5; border-radius:4px; border:1px solid rgba(0,0,0,0.15); font-family:Monaco,Menlo,Consolas,'Courier New',monospace">:ramen:</pre> means <img src="https://{{ external_host }}/static/third/gemoji/images/emoji/ramen.png" style="max-height:20px; height:20px;" height="20px" />.</li>
</ol>
{% if enterprise is False %}
{% if not_enterprise %}
<p>Zulip is under active development, and we have a team of engineers standing by to respond to your feedback, so please report bugs and let us know what you think! There's a feedback tab under the gear icon in the upper-right corner, or you can e-mail us at <a href="mailto:feedback@zulip.com" style="color:#08c">feedback@zulip.com</a>.</p>
{% endif %}

8
templates/zerver/emails/followup/day1.text
View File

@ -2,10 +2,10 @@ Hi there!
Welcome to Zulip!
https://zulip.com/hello has a nice overview of what we're up to, but here are a couple tips that'll help you get the most out of it:
https://{{ external_host }}/hello has a nice overview of what we're up to, but here are a couple tips that'll help you get the most out of it:
1. Zulip works best when it's always open, so grab our apps! (Mac, Windows, Linux, Android, iOS)
https://zulip.com/apps
https://{{ external_host }}/apps
2. Keyboard shortcuts: learn about them in the Keyboard Shortcuts tab under the gear icon. (Or press '?')
@ -17,10 +17,10 @@ https://zulip.com/hello has a nice overview of what we're up to, but here are a
print "Hello"
~~~
4. Got automation? Check out https://zulip.com/integrations and https://zulip.com/api for easy integration with services like GitHub, Jenkins, Nagios, and Trac. They're super-easy to set up and make things a lot more useful.
4. Got automation? Check out https://{{ external_host }}/integrations and https://{{ external_host }}/api for easy integration with services like GitHub, Jenkins, Nagios, and Trac. They're super-easy to set up and make things a lot more useful.
5. Emoji. Because :ramen:
{% if enterprise is False %}
{% if not_enterprise %}
Zulip is under active development, and we have a team of engineers standing by to respond to your feedback, so please report bugs and let us know what you think! There's a feedback tab under the gear icon in the upper-right corner, or you can e-mail us at feedback@zulip.com.
{% endif %}
-Waseem, for the Zulip team

8
zerver/worker/queue_processors.py
View File

@ -110,10 +110,14 @@ class SignupWorker(QueueProcessingWorker):
if settings.ENTERPRISE:
sender = {'email': settings.ZULIP_ADMINISTRATOR, 'name': 'Zulip'}
template_payload = {'name': name,
'not_enterprise': not settings.ENTERPRISE,
'external_host': settings.EXTERNAL_HOST}
#Send day 1 email
send_local_email_template_with_delay([{'email': email, 'name': name}],
"zerver/emails/followup/day1",
{'name': name},
template_payload,
datetime.timedelta(hours=1),
tags=["followup-emails"],
sender=sender)
@ -124,7 +128,7 @@ class SignupWorker(QueueProcessingWorker):
assert(datetime.datetime.utcnow() < tomorrow_morning)
send_local_email_template_with_delay([{'email': email, 'name': name}],
"zerver/emails/followup/day2",
{'name': name},
template_payload,
tomorrow_morning - datetime.datetime.utcnow(),
tags=["followup-emails"],
sender=sender)