email -> email_link and html_mailto_link

Author: tristanlabelle

app/backend/src/couchers/email/blocks.py

@@ -13,7 +13,7 @@
 from couchers.email.locales import get_emails_i18next
 from couchers.i18n import LocalizationContext
 from couchers.i18n.i18next import SubstitutionDict, full_string_key
-from couchers.markup import html_email_link
+from couchers.markup import html_mailto_link
 from couchers.proto import api_pb2
 from couchers.utils import now
 
@@ -59,7 +59,7 @@ def _body_builder(
             # Not localizing the suggested subject line to encourage folks to use English if they can.
             builder.para(
                 "generic.security_warning_contact_support",
-                {"email_link": html_email_link("support@couchers.org", subject="Action not initiated by me")},
+                {"email_link": html_mailto_link("support@couchers.org", subject="Action not initiated by me")},
                 epilogue=True,
             )
         if default_closing:

app/backend/src/couchers/email/emails.py

@@ -48,7 +48,7 @@
 from couchers.email.locales import get_emails_i18next
 from couchers.i18n import LocalizationContext
 from couchers.i18n.localize import format_phone_number
-from couchers.markup import html_email_link, html_link, markdown_to_plaintext
+from couchers.markup import html_link, html_mailto_link, markdown_to_plaintext
 from couchers.notifications.quick_links import generate_quick_decline_link
 from couchers.proto import conversations_pb2, events_pb2, notification_data_pb2
 from couchers.utils import now, to_aware_datetime
@@ -549,7 +549,7 @@ def get_body_blocks(self, loc_context: LocalizationContext) -> list[EmailBlock]:
         builder.para(".invoice_receipt_info")
         builder.action(self.receipt_url, ".download_invoice")
         builder.para(".tax_acknowledgment")
-        builder.para(".questions_contact", {"email": html_email_link("donations@couchers.org")})
+        builder.para(".questions_contact", {"email_link": html_mailto_link("donations@couchers.org")})
         builder.para("generic.thanks")
         builder.para("generic.closing_lines.founders")
         return builder.build()
@@ -1769,7 +1769,7 @@ def get_body_blocks(self, loc_context: LocalizationContext) -> list[EmailBlock]:
             builder.para(
                 "generic.closing_lines.emily",
                 {
-                    "email_link": html_email_link("community@couchers.org"),
+                    "email_link": html_mailto_link("community@couchers.org"),
                     "profile_link": html_link("https://couchers.org/user/emily"),
                 },
             )

app/backend/src/couchers/email/locales/en.json

@@ -129,7 +129,7 @@
     "invoice_receipt_info": "You can download an invoice and receipt for the donation here:",
     "download_invoice": "Download invoice",
     "tax_acknowledgment": "Couchers, Inc. is a 501(c)(3) nonprofit (EIN: 87-1734577) registered in the United States. No goods or services were provided in exchange for this contribution.",
-    "questions_contact": "If you have any questions about your donation, please email us at {{ email }}."
+    "questions_contact": "If you have any questions about your donation, please email us at {{ email_link }}."
   },
   "email_change": {
     "initiated": {

app/backend/src/couchers/email/rendering.py

@@ -17,7 +17,7 @@
 from couchers.email.smtp import embed_html_relative_images
 from couchers.i18n import LocalizationContext
 from couchers.i18n.i18next import SubstitutionDict, full_string_key
-from couchers.markup import html_email_link, html_to_plaintext, markdown_to_html
+from couchers.markup import html_mailto_link, html_to_plaintext, markdown_to_html
 from couchers.proto.internal import jobs_pb2
 from couchers.templating import Jinja2Template
 
@@ -128,7 +128,7 @@ def localize(key: str, substitutions: SubstitutionDict | None = None) -> Markup:
 
     args: dict[str, Any] = {
         "received_because": localize(".received_because"),
-        "contact_support": localize(".contact_support", {"email_link": html_email_link("support@couchers.org")}),
+        "contact_support": localize(".contact_support", {"email_link": html_mailto_link("support@couchers.org")}),
         "timezone_note": localize(".timezone_note", {"timezone": footer.timezone_name}),
         "copyright_year": footer.copyright_year,
         "donate_link": localize(".donate_link"),

app/backend/src/couchers/markup.py

@@ -63,7 +63,7 @@ def handle_data(self, data: str) -> None:
         self.plaintext += data.replace("\n", "")  # Newlines in html are meaningless
 
 
-def html_email_link(email: str, subject: str | None = None) -> Markup:
+def html_mailto_link(email: str, subject: str | None = None) -> Markup:
     url = f"mailto:{email}"
     if subject:
         query = {"subject": subject}