paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 22:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

find team flow: Update text in emails and templates.

Browse Source
This commit is contained in:
Rishi Gupta
2017-01-04 18:42:53 -08:00
committed by Tim Abbott
parent e481fef9e1
commit 0039689acb
5 changed files with 46 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
templates/zerver/emails/find_team/find_team_email.html
View File

@@ -1,9 +1,31 @@
<p>Hello {{ user_profile.full_name }},<p> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Zulip</title>
</head>
<body>
<p>Hi {{ user_profile.full_name }},</p>
<p>You can log into Zulip using {{ user_profile.email }} on following organization:</p> <p>You can log in to your Zulip organization, {{ user_profile.realm.name }},
at the following link:</p>
<p><a href="{{ user_profile.realm.uri }}">{{ user_profile.realm.name }}</a></p> <table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td align="center">
<a href="{{ user_profile.realm.uri }}" style="color:#08c">{{ user_profile.realm.uri }}</a>
</td>
</tr>
</table>
<p>Cheers, <p>The email address associated with your account is <b>{{ user_profile.email }}</b>.</p>
<br>
The Zulip Team</p> {% if verbose_support_offers %}
<p>If you have trouble signing in, please contact Zulip support by replying to
this email.</p>
{% endif %}
<p>Thanks for using Zulip!</p>
</body>
</html>

2
templates/zerver/emails/find_team/find_team_email.subject
View File

@@ -1 +1 @@
Your Zulip Team Your Zulip login page

16
templates/zerver/emails/find_team/find_team_email.txt
View File

@@ -1,8 +1,14 @@
Hello {{ user_profile.full_name }}, Hi {{ user_profile.full_name }},
You can log into Zulip using {{ user_profile.email }} on following organization: You can log in to your Zulip organization, {{ user_profile.realm.name }},
at the following link:
{{ user_profile.realm.uri }}
- {{ user_profile.realm.name }} through {{ user_profile.realm.uri }} The email address associated with your account is {{ user_profile.email }}.
Cheers, {% if verbose_support_offers %}
The Zulip Team If you have trouble signing in, please contact Zulip support by replying to
this email.
{% endif %}
Thanks for using Zulip!

9
templates/zerver/find_my_team.html
View File

@@ -9,8 +9,9 @@
{% if emails %} {% if emails %}
<div id="results"> <div id="results">
<p> <p>
We have checked the following email address(es). Any email address Emails sent! You will only receive emails at addresses associated
not associated with Zulip was not sent the sign-in information. with Zulip organizations. The addresses entered on the previous page
are listed below:
</p> </p>
<ul> <ul>
@@ -22,8 +23,8 @@
{% else %} {% else %}
<div class="find-team-form"> <div class="find-team-form">
<p> <p>
We will send you an email with the sign-in information against We will send you an email with the sign-in information for
any email address associated with Zulip. any Zulip organization(s) associated with the addresses you enter below.
</p> </p>
<form class="form-inline" id="find_my_team" name="email_form" <form class="form-inline" id="find_my_team" name="email_form"
action="{{ current_url() }}" method="post"> action="{{ current_url() }}" method="post">

2
zerver/tests/tests.py
View File

@@ -2316,7 +2316,7 @@ class FindMyTeamTestCase(ZulipTestCase):
url = '/find-my-team/?emails=iago@zulip.com,cordelia@zulip.com' url = '/find-my-team/?emails=iago@zulip.com,cordelia@zulip.com'
result = self.client_get(url) result = self.client_get(url)
content = result.content.decode('utf8') content = result.content.decode('utf8')
self.assertIn("We have checked the following email address(es)", content) self.assertIn("Emails sent! You will only receive emails", content)
self.assertIn("iago@zulip.com", content) self.assertIn("iago@zulip.com", content)
self.assertIn("cordelia@zulip.com", content) self.assertIn("cordelia@zulip.com", content)