From d3834f8b9ac8ba55758ba3f7461b0f44cb031309 Mon Sep 17 00:00:00 2001
From: Vishnu KS <yo@vishnuks.com>
Date: Fri, 17 Jul 2020 12:47:15 +0000
Subject: [PATCH] emails: Simplify requested by line in sponsorship email.

---
 corporate/tests/test_stripe.py                   | 2 +-
 templates/zerver/emails/sponsorship_request.html | 2 +-
 templates/zerver/emails/sponsorship_request.txt  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/corporate/tests/test_stripe.py b/corporate/tests/test_stripe.py
index 5f2fdb2070..567d0f00d4 100644
--- a/corporate/tests/test_stripe.py
+++ b/corporate/tests/test_stripe.py
@@ -1100,7 +1100,7 @@ class StripeTest(StripeTestCase):
             self.assertEqual(message.subject, "Sponsorship request (Open-source) for zulip")
             self.assertEqual(message.reply_to, ['hamlet@zulip.com'])
             self.assertIn('Zulip sponsorship <noreply-', message.from_email)
-            self.assertIn("User role: Member", message.body)
+            self.assertIn("Requested by: King Hamlet (Member)", message.body)
             self.assertIn("Support URL: http://zulip.testserver/activity/support?q=zulip", message.body)
             self.assertIn("Website: https://infinispan.org", message.body)
             self.assertIn("Organization type: Open-source", message.body)
diff --git a/templates/zerver/emails/sponsorship_request.html b/templates/zerver/emails/sponsorship_request.html
index e5c019707f..2f7056f99a 100644
--- a/templates/zerver/emails/sponsorship_request.html
+++ b/templates/zerver/emails/sponsorship_request.html
@@ -19,6 +19,6 @@
 
 <br><br>
 
-<b>Requested by</b>: {{ requested_by }} · <b>User role</b>: {{ user_role }} · <b>String ID</b>: {{ string_id }}
+<b>Requested by</b>: {{ requested_by }} ({{ user_role }})
 
 {% endblock %}
diff --git a/templates/zerver/emails/sponsorship_request.txt b/templates/zerver/emails/sponsorship_request.txt
index 35dc3dbfb5..3c843f8c5d 100644
--- a/templates/zerver/emails/sponsorship_request.txt
+++ b/templates/zerver/emails/sponsorship_request.txt
@@ -7,4 +7,4 @@ Organization type: {{ organization_type }}
 Description:
 {{ description }}
 
-Requested by: {{ requested_by }} · User role: {{ user_role }} · String ID: {{ string_id }}
+Requested by: {{ requested_by }} ({{ user_role }})