paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-23 16:14:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

send_email: Update 'from_name' for non user-facing emails.

Browse Source 
This commit performs a minor update in 'from_name' text for
'support' and 'sponsorship' emails.

Removes capitalization and adds a comment specifying that the
emails are not user-facing.
This commit is contained in:
Prakhar Pratyush
2023-01-03 13:33:41 +05:30
committed by Tim Abbott
parent 78a75ab28c
commit 44d8dc66d2
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
corporate/tests/test_stripe.py
View File

@@ -1789,7 +1789,7 @@ class StripeTest(StripeTestCase):
self.assertEqual(message.subject, "Support request for zulip")
self.assertEqual(message.reply_to, ["hamlet@zulip.com"])
self.assertEqual(self.email_envelope_from(message), settings.NOREPLY_EMAIL_ADDRESS)
self.assertIn("Zulip Support <noreply-", self.email_display_from(message))
self.assertIn("Zulip support request <noreply-", self.email_display_from(message))
self.assertIn("Requested by: King Hamlet (Member)", message.body)
self.assertIn(
"Support URL: http://zulip.testserver/activity/support?q=zulip", message.body
@@ -1840,7 +1840,7 @@ class StripeTest(StripeTestCase):
self.assertEqual(message.subject, "Sponsorship request (Open-source project) for zulip")
self.assertEqual(message.reply_to, ["hamlet@zulip.com"])
self.assertEqual(self.email_envelope_from(message), settings.NOREPLY_EMAIL_ADDRESS)
self.assertIn("Zulip sponsorship <noreply-", self.email_display_from(message))
self.assertIn("Zulip sponsorship request <noreply-", self.email_display_from(message))
self.assertIn("Requested by: King Hamlet (Member)", message.body)
self.assertIn(
"Support URL: http://zulip.testserver/activity/support?q=zulip", message.body

4
corporate/views/support.py
View File

@@ -41,11 +41,11 @@ def support_request(request: HttpRequest) -> HttpResponse:
"support_url": get_support_url(user.realm),
"user_role": user.get_role_name(),
}
# Sent to the server's support team, so this email is not user-facing.
send_email(
"zerver/emails/support_request",
to_emails=[FromAddress.SUPPORT],
from_name="Zulip Support",
from_name="Zulip support request",
from_address=FromAddress.tokenized_no_reply_address(),
reply_to_email=user.delivery_email,
context=email_context,

3
corporate/views/upgrade.py
View File

@@ -202,10 +202,11 @@ def sponsorship(
"paid_users_count": paid_users_count,
"paid_users_description": paid_users_description,
}
# Sent to the server's support team, so this email is not user-facing.
send_email(
"zerver/emails/sponsorship_request",
to_emails=[FromAddress.SUPPORT],
from_name="Zulip sponsorship",
from_name="Zulip sponsorship request",
from_address=FromAddress.tokenized_no_reply_address(),
reply_to_email=user.delivery_email,
context=context,