account creation and password resets: Switch from Humbug to Zulip in user-visible text.

(imported from commit 5a145938dd0509385e553ab41e0eafb98825006d)
This commit is contained in:
Jessica McKellar
2013-07-10 16:47:48 -04:00
parent 0a2e9b1507
commit cc121490fe
10 changed files with 14 additions and 14 deletions

View File

@@ -1,6 +1,6 @@
Hi there,
{{ referrer.full_name }} ({{ referrer.email }}) wants you to join them on Humbug -- the group communication tool you've always wished you had at work.
{{ referrer.full_name }} ({{ referrer.email }}) wants you to join them on Zulip -- the group communication tool you've always wished you had at work.
To get started, visit the link below:
<{{ activate_url }}>
@@ -9,4 +9,4 @@ Feel free to give us a shout at <support@humbughq.com> if you have any questions
Cheers,
The Humbug Team
The Zulip Team

View File

@@ -1 +1 @@
{{referrer.full_name}} invited you to join Humbug
{{referrer.full_name}} invited you to join Zulip

View File

@@ -1,8 +1,8 @@
Hello,
Thanks for giving Humbug a try!
Thanks for giving Zulip a try!
There are a few steps you need to take to ensure Humbug works with your
There are a few steps you need to take to ensure Zulip works with your
MIT Zephyr account.
1) Create a password and activate your account:
@@ -18,5 +18,5 @@ problems.
Cheers,
All of us here at Humbug
All of us here at Zulip

View File

@@ -1 +1 @@
Activate your Humbug account
Activate your Zulip account

View File

@@ -1,6 +1,6 @@
Hello there.
You recently signed up for Humbug. Awesome!
You recently signed up for Zulip. Awesome!
To complete signup, visit this link below:
<{{ activate_url }}>
@@ -9,4 +9,4 @@ Feel free to give us a shout at <support@humbughq.com> if you have any questions
Cheers,
The Humbug Team
The Zulip Team

View File

@@ -1 +1 @@
Activate your Humbug account
Activate your Zulip account

View File

@@ -10,6 +10,6 @@
<p>You might want to <a href="{% url 'django_openid_auth.views.login_begin' %}">try logging in via Google again</a>
or <a href="{% url 'django.contrib.auth.views.login' %}">log in with a username or password.</a></p>
<p>If you'd like, you can also <a href="mailto:support@humbughq.com?Subject=Error%20logging%20in%20with%20Google%20Apps&Body=Hi%20there%2C%0A%0AI%20encountered%20an%20error%20when%20attempting%20to%20log%20in%20with%20Google%20Apps%20on%20Humbug%20using%20my%20email%20address%20youremailgoeshere@yourdomain.example.com%0A%0AError%20message%3A%20%20{{ message|escape }}%0A%0ASincerely%2C%20%0A%0AYour%20name%20here">drop us a line</a> to let us know what happened.</p>
<p>If you'd like, you can also <a href="mailto:support@humbughq.com?Subject=Error%20logging%20in%20with%20Google%20Apps&Body=Hi%20there%2C%0A%0AI%20encountered%20an%20error%20when%20attempting%20to%20log%20in%20with%20Google%20Apps%20on%20Zulip%20using%20my%20email%20address%20youremailgoeshere@yourdomain.example.com%0A%0AError%20message%3A%20%20{{ message|escape }}%0A%0ASincerely%2C%20%0A%0AYour%20name%20here">drop us a line</a> to let us know what happened.</p>
{% endblock %}

View File

@@ -4,4 +4,4 @@ It's all good. Follow the link below and we'll take care of the rest:
<{{ protocol}}://{{ domain }}{% url 'django.contrib.auth.views.password_reset_confirm' uidb36=uid token=token %}>
Thanks,
Your friends at Humbug HQ
Your friends at Zulip HQ

View File

@@ -1 +1 @@
Humbug password reset
Zulip password reset

View File

@@ -12,7 +12,7 @@ Allow the user to accept the terms, creating an email record of that fact.
<div class="pitch">
<hr/>
<p>You're almost there. We just need you to do one last thing.</p>
<h3>Accept the Humbug terms of service</h3>
<h3>Accept the Zulip terms of service</h3>
</div>
<form method="post" class="form-horizontal" id="registration" action="{% url 'zephyr.views.accounts_accept_terms' %}">