Backend/emails: Take links out of loc files.

Author: tristanlabelle

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

@@ -8,6 +8,7 @@
 from typing import Self, assert_never
 
 from markupsafe import Markup, escape
+from urllib.parse import urlencode
 
 from couchers import urls
 from couchers.config import config
@@ -513,7 +514,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")
+        builder.para(".questions_contact", { "email": _email_link_markup("donations@couchers.org")})
         builder.para(".generosity_helps")
         builder.para(".thank_you")
         builder.para("generic.founders_signature")
@@ -1665,14 +1666,20 @@ def get_body_blocks(self, loc_context: LocalizationContext) -> list[EmailBlock]:
             builder.para(".link", {"url": urls.app_link()})
             builder.para(".platform_under_development")
             builder.para(".thanks_for_joining")
-            builder.para(".signature")
+            builder.para(".signature", {
+                "email_link": _email_link_markup("aapeliv@couchers.org"),
+                "profile_link": _link_markup("https://couchers.org/user/aapeli")
+            })
         else:
             builder.para(".intro")
             builder.para(".fill_in_profile")
             builder.action(edit_profile_url, ".edit_profile_action")
             builder.para(".no_empty_accounts")
             builder.para(".profile_importance")
-            builder.para(".signature")
+            builder.para(".signature", {
+                "email_link": _email_link_markup("community@couchers.org"),
+                "profile_link": _link_markup("https://couchers.org/user/emily")
+            })
         return builder.build()
 
     @classmethod
@@ -2039,3 +2046,12 @@ def test_instances(cls) -> list[Self]:
 
 def _localize_host_request_date(value: date, loc_context: LocalizationContext) -> str:
     return loc_context.localize_date(value, with_year=False, with_day_of_week=True)
+
+def _email_link_markup(email: str, subject: str | None = None) -> Markup:
+    url = f"mailto:{email}"
+    if subject:
+        url += f"?subject={urlencode(subject)}"
+    return _link_markup(url, text=email)
+
+def _link_markup(url: str, *, text: str | None = None) -> Markup:
+    return Markup(f'<a href="{escape(url)}">{escape(text or url)}</a>')

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

@@ -3,7 +3,7 @@
     "greeting_line": "Hi {{name}},",
     "closing_line": "Best,<br>The Couchers.org Team",
     "founders_signature": "Aapeli and Itsi,<br>Couchers.org Founders",
-    "security_warning_contact_support": "If you did not initiate this action, please contact us by emailing <a href=\"mailto:support@couchers.org\">support@couchers.org</a> so we can sort this out as soon as possible!",
+    "security_warning_contact_support": "If you did not initiate this action, please contact us by emailing {{ email_link }} so we can sort this out as soon as possible!",
     "do_not_reply_request": "<b>Do not reply to this email.</b> Use one of the buttons above to reply to this request."
   },
   "calendar_events": {
@@ -112,7 +112,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 <a href=\"mailto:donations@couchers.org\">donations@couchers.org</a>.",
+    "questions_contact": "If you have any questions about your donation, please email us at {{ email }}.",
     "generosity_helps": "Your generosity will help deliver the platform for everyone.",
     "thank_you": "Thank you!"
   },
@@ -272,7 +272,7 @@
       "link": "Link: <a href=\"{{ url }}\">{{ url }}",
       "platform_under_development": "The platform is still under development, and features are actively being built by our amazing team of Couchers.org contributors around the world. We would like to hear your feedback and thoughts on what we've built and what we're working on.",
       "thanks_for_joining": "Thanks so much for joining the platform. We're really excited to have you here and as part of our growing community!",
-      "signature": "Aapeli<br>Couchers.org Co-founder<br><a href=\"mailto:aapeli@couchers.org\">aapeli@couchers.org</a> (feel free to shoot me an email at any time)<br><br><a href=\"https://couchers.org/user/aapeli\">https://couchers.org/user/aapeli</a>"
+      "signature": "Aapeli<br>Couchers.org Co-founder<br>{{ email_link }} (feel free to shoot me an email at any time)<br><br>{{ profile_link }}"
     },
     "follow_up": {
       "subject": "Complete your profile on Couchers.org",
@@ -281,7 +281,7 @@
       "edit_profile_action": "Go to edit your profile",
       "no_empty_accounts": "A big problem that some platforms have is that there are so many empty accounts, and we really want to avoid that!",
       "profile_importance": "We would really appreciate it if you could add a photo and fill in at least the \"Who I am\" section of your profile, although a full profile would be even better! It's an easy way to help showcase the amazing community we're building together, and it means you'll be fully ready to connect, host, or surf as the community thrives.",
-      "signature": "Emily from Couchers.org<br><a href=\"mailto:community@couchers.org\">community@couchers.org</a><br><br><a href=\"https://couchers.org/user/emily\">https://couchers.org/user/emily</a>"
+      "signature": "Emily from Couchers.org<br>{{ email_link }}<br><br>{{ profile_link }}"
     }
   },
   "password_changed": {