From ad3bed20865ae15fafe87e23198496754b5f634c Mon Sep 17 00:00:00 2001
From: Lauryn Menard <lauryn@zulip.com>
Date: Wed, 20 Sep 2023 15:26:53 +0200
Subject: [PATCH] emails: Fix contact_us macros for "mailto" scheme in email
 links.

Updates the contact_us_zulip_cloud and contact_us_self_hosted email
macros to have the "mailto" scheme in the anchor tag for the support
email address.

Also updates the Zulip Cloud version for the account_registered
support email link, which has a slightly different format/text than
the macro.
---
 templates/zerver/emails/account_registered.html | 2 +-
 templates/zerver/emails/macros.html             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/zerver/emails/account_registered.html b/templates/zerver/emails/account_registered.html
index f182c50157..eb22215d37 100644
--- a/templates/zerver/emails/account_registered.html
+++ b/templates/zerver/emails/account_registered.html
@@ -54,7 +54,7 @@
 
 <p>
     {% if corporate_enabled %}
-        {% trans %}Questions? <a href="{{ support_email }}">Contact us</a> — we'd love to help!{% endtrans %}
+        {% trans %}Questions? <a href="mailto:{{ support_email }}">Contact us</a> — we'd love to help!{% endtrans %}
     {% else %}
         {{macros.contact_us_self_hosted(support_email)}}
     {% endif %}
diff --git a/templates/zerver/emails/macros.html b/templates/zerver/emails/macros.html
index c1436ab320..6d6004f13c 100644
--- a/templates/zerver/emails/macros.html
+++ b/templates/zerver/emails/macros.html
@@ -11,9 +11,9 @@
 {%- endmacro %}
 
 {% macro contact_us_self_hosted(email) -%}
-    {% trans %}If you have any questions, please contact this Zulip server's administrators at <a href="{{ email }}">{{ email }}</a>.{% endtrans %}
+    {% trans %}If you have any questions, please contact this Zulip server's administrators at <a href="mailto:{{ email }}">{{ email }}</a>.{% endtrans %}
 {%- endmacro %}
 
 {% macro contact_us_zulip_cloud(email) -%}
-    {% trans %}Do you have questions or feedback to share? <a href="{{ email }}">Contact us</a> — we'd love to help!{% endtrans %}
+    {% trans %}Do you have questions or feedback to share? <a href="mailto:{{ email }}">Contact us</a> — we'd love to help!{% endtrans %}
 {%- endmacro %}