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

emails: Remove organization type from sponsorship request emails. 

This makes the subject nicer for replying to these emails.
This commit is contained in:
Alya Abbott 2024-01-17 12:37:04 -08:00 committed by Tim Abbott
parent 8272210b47
commit 91ee0bf676
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
corporate/tests/test_stripe.py
View File

@ -1908,7 +1908,7 @@ class StripeTest(StripeTestCase):
for message in outbox: for message in outbox:
self.assert_length(message.to, 1) self.assert_length(message.to, 1)
self.assertEqual(message.to[0], "sales@zulip.com") self.assertEqual(message.to[0], "sales@zulip.com")
self.assertEqual(message.subject, "Sponsorship request (Open-source project) for zulip") self.assertEqual(message.subject, "Sponsorship request for zulip")
self.assertEqual(message.reply_to, ["hamlet@zulip.com"]) self.assertEqual(message.reply_to, ["hamlet@zulip.com"])
self.assertEqual(self.email_envelope_from(message), settings.NOREPLY_EMAIL_ADDRESS) self.assertEqual(self.email_envelope_from(message), settings.NOREPLY_EMAIL_ADDRESS)
self.assertIn("Zulip sponsorship request <noreply-", self.email_display_from(message)) self.assertIn("Zulip sponsorship request <noreply-", self.email_display_from(message))
@ -6239,7 +6239,7 @@ class TestRemoteRealmBillingFlow(StripeTestCase, RemoteRealmBillingTestCase):
self.assert_length(outbox, 2) self.assert_length(outbox, 2)
self.assert_length(message.to, 1) self.assert_length(message.to, 1)
self.assertEqual(message.to[0], "sales@zulip.com") self.assertEqual(message.to[0], "sales@zulip.com")
self.assertEqual(message.subject, "Sponsorship request (Open-source project) for Zulip Dev") self.assertEqual(message.subject, "Sponsorship request for Zulip Dev")
self.assertEqual(message.reply_to, ["hamlet@zulip.com"]) self.assertEqual(message.reply_to, ["hamlet@zulip.com"])
self.assertEqual(self.email_envelope_from(message), settings.NOREPLY_EMAIL_ADDRESS) self.assertEqual(self.email_envelope_from(message), settings.NOREPLY_EMAIL_ADDRESS)
self.assertIn("Zulip sponsorship request <noreply-", self.email_display_from(message)) self.assertIn("Zulip sponsorship request <noreply-", self.email_display_from(message))
@ -6748,9 +6748,7 @@ class TestRemoteServerBillingFlow(StripeTestCase, RemoteServerTestCase):
self.assert_length(outbox, 2) self.assert_length(outbox, 2)
self.assert_length(message.to, 1) self.assert_length(message.to, 1)
self.assertEqual(message.to[0], "sales@zulip.com") self.assertEqual(message.to[0], "sales@zulip.com")
self.assertEqual( self.assertEqual(message.subject, "Sponsorship request for demo.example.com")
message.subject, "Sponsorship request (Open-source project) for demo.example.com"
)
self.assertEqual(message.reply_to, ["hamlet@zulip.com"]) self.assertEqual(message.reply_to, ["hamlet@zulip.com"])
self.assertEqual(self.email_envelope_from(message), settings.NOREPLY_EMAIL_ADDRESS) self.assertEqual(self.email_envelope_from(message), settings.NOREPLY_EMAIL_ADDRESS)
self.assertIn("Zulip sponsorship request <noreply-", self.email_display_from(message)) self.assertIn("Zulip sponsorship request <noreply-", self.email_display_from(message))

2
templates/zerver/emails/sponsorship_request.subject.txt
View File

@ -1 +1 @@
Sponsorship request ({{ organization_type }}) for {{ billing_entity }} Sponsorship request for {{ billing_entity }}