fix(alerts): respect 24-hour clock preference in email notifications (#106884)

emails now check if you're a 24-hour time person and format accordingly.
issue alerts, digests, and feedback emails all got the change.

Fixes #106581

the html is kinda miserable to review but it works
<img width="586" height="113" alt="24tz"
src="https://github.com/user-attachments/assets/a5d44869-aabb-42c6-a13f-bf9639b38d9b"
/>

---------

Co-authored-by: Claude <noreply@anthropic.com>

Author: 2 people

src/sentry/notifications/notifications/digest.py

@@ -81,9 +81,12 @@ def get_subject(self, context: Mapping[str, Any] | None = None) -> str:
             # This shouldn't be possible but adding a message just in case.
             return "Digest Report"
 
-        # Use timezone from context if available (added by get_recipient_context)
+        # Use timezone and clock format from context (added by get_recipient_context)
         timezone = context.get("timezone")
-        return get_digest_subject(context["group"], context["counts"], context["start"], timezone)
+        clock_24_hours = context.get("clock_24_hours", False)
+        return get_digest_subject(
+            context["group"], context["counts"], context["start"], timezone, clock_24_hours
+        )
 
     def get_notification_title(
         self, provider: ExternalProviders, context: Mapping[str, Any] | None = None
@@ -118,18 +121,23 @@ def get_recipient_context(
         self, recipient: Actor, extra_context: Mapping[str, Any]
     ) -> MutableMapping[str, Any]:
         tz: tzinfo = UTC
+        clock_24_hours = False
         if recipient.is_user:
             user_options = user_option_service.get_many(
-                filter={"user_ids": [recipient.id], "keys": ["timezone"]}
+                filter={"user_ids": [recipient.id], "keys": ["timezone", "clock_24_hours"]}
             )
             user_tz = get_option_from_list(user_options, key="timezone", default="UTC")
+            clock_24_hours = bool(
+                get_option_from_list(user_options, key="clock_24_hours", default=False)
+            )
             try:
                 tz = zoneinfo.ZoneInfo(user_tz)
             except (ValueError, zoneinfo.ZoneInfoNotFoundError):
                 pass
         return {
             **super().get_recipient_context(recipient, extra_context),
             "timezone": tz,
+            "clock_24_hours": clock_24_hours,
         }
 
     def get_context(self) -> MutableMapping[str, Any]:

src/sentry/notifications/notifications/rules.py

@@ -138,18 +138,23 @@ def get_recipient_context(
         self, recipient: Actor, extra_context: Mapping[str, Any]
     ) -> MutableMapping[str, Any]:
         tz: tzinfo = UTC
+        clock_24_hours = False
         if recipient.is_user:
             user_options = user_option_service.get_many(
-                filter={"user_ids": [recipient.id], "keys": ["timezone"]}
+                filter={"user_ids": [recipient.id], "keys": ["timezone", "clock_24_hours"]}
             )
             user_tz = get_option_from_list(user_options, key="timezone", default="UTC")
+            clock_24_hours = bool(
+                get_option_from_list(user_options, key="clock_24_hours", default=False)
+            )
             try:
                 tz = zoneinfo.ZoneInfo(user_tz)
             except (ValueError, zoneinfo.ZoneInfoNotFoundError):
                 pass
         return {
             **super().get_recipient_context(recipient, extra_context),
             "timezone": tz,
+            "clock_24_hours": clock_24_hours,
         }
 
     def get_image_url(self) -> str | None:

src/sentry/notifications/utils/digest.py

@@ -16,17 +16,24 @@
 
 
 def get_digest_subject(
-    group: Group, counts: Counter[Group], date: datetime, timezone: tzinfo | None = None
+    group: Group,
+    counts: Counter[Group],
+    date: datetime,
+    timezone: tzinfo | None = None,
+    clock_24_hours: bool = False,
 ) -> str:
     # Convert date to user's timezone if provided
     if timezone:
         date = date.astimezone(timezone)
 
+    # Use 24-hour format (H:i) or 12-hour format (P) based on user preference
+    date_format = "N j, Y, H:i e" if clock_24_hours else "N j, Y, P e"
+
     return "{short_id} - {count} new {noun} since {date}".format(
         short_id=group.qualified_short_id,
         count=len(counts),
         noun="alert" if len(counts) == 1 else "alerts",
-        date=dateformat.format(date, "N j, Y, P e"),
+        date=dateformat.format(date, date_format),
     )
 
 

src/sentry/templates/sentry/emails/digests/body.html

@@ -24,14 +24,26 @@
 
 <div class="container" style="padding-top: 30px;">
   <h2>{{ counts|length }} new alert{{ counts|pluralize }} from <a href="{{ project.get_absolute_url }}">{{ project.slug }}</a></h2>
-  {% if timezone %}
-    {% with start=start|timezone:timezone|date:"N j, Y, P e" end=end|timezone:timezone|date:"N j, Y, P e" %}
-      <div class="dateline">{{ start }}{% if start != end %} to {{ end }}{% endif %}</div>
-    {% endwith %}
+  {% if clock_24_hours %}
+    {% if timezone %}
+      {% with start=start|timezone:timezone|date:"N j, Y, H:i e" end=end|timezone:timezone|date:"N j, Y, H:i e" %}
+        <div class="dateline">{{ start }}{% if start != end %} to {{ end }}{% endif %}</div>
+      {% endwith %}
+    {% else %}
+      {% with start=start|date:"N j, Y, H:i e" end=end|date:"N j, Y, H:i e" %}
+        <div class="dateline">{{ start }}{% if start != end %} to {{ end }}{% endif %}</div>
+      {% endwith %}
+    {% endif %}
   {% else %}
-    {% with start=start|date:"N j, Y, P e" end=end|date:"N j, Y, P e" %}
-      <div class="dateline">{{ start }}{% if start != end %} to {{ end }}{% endif %}</div>
-    {% endwith %}
+    {% if timezone %}
+      {% with start=start|timezone:timezone|date:"N j, Y, P e" end=end|timezone:timezone|date:"N j, Y, P e" %}
+        <div class="dateline">{{ start }}{% if start != end %} to {{ end }}{% endif %}</div>
+      {% endwith %}
+    {% else %}
+      {% with start=start|date:"N j, Y, P e" end=end|date:"N j, Y, P e" %}
+        <div class="dateline">{{ start }}{% if start != end %} to {{ end }}{% endif %}</div>
+      {% endwith %}
+    {% endif %}
   {% endif %}
 </div>
 
@@ -62,11 +74,13 @@ <h2>{{ counts|length }} new alert{{ counts|pluralize }} from <a href="{{ project
                   <td class="event-detail">
                       {% include "sentry/emails/_group.html" %}
                       <div>
-                        {% if timezone %}
-                          <small>{{ records.0.datetime|timezone:timezone|date:"N j, Y, g:i:s a e" }}</small>
-                        {% else %}
-                          <small>{{ records.0.datetime|date:"N j, Y, g:i:s a e" }}</small>
-                        {% endif %}
+                        <small>
+                          {% if clock_24_hours %}
+                            {% if timezone %}{{ records.0.datetime|timezone:timezone|date:"N j, Y, H:i:s e" }}{% else %}{{ records.0.datetime|date:"N j, Y, H:i:s e" }}{% endif %}
+                          {% else %}
+                            {% if timezone %}{{ records.0.datetime|timezone:timezone|date:"N j, Y, g:i:s a e" }}{% else %}{{ records.0.datetime|date:"N j, Y, g:i:s a e" }}{% endif %}
+                          {% endif %}
+                        </small>
                         {% if show_replay_links and group.has_replays %}
                           <span class="replay-link">
                             <a href="{{ group.get_absolute_url }}replays?referrer=alert_email">

src/sentry/templates/sentry/emails/digests/body.txt

@@ -1,7 +1,7 @@
 {% load timezone from tz %}
 {% load sentry_helpers %}
 {% load sentry_features %}Notifications for {{ project.slug }}
-{% if timezone %}{{ start|timezone:timezone|date:"N j, Y, P e" }} to {{ end|timezone:timezone|date:"N j, Y, P e" }}{% else %}{{ start|date:"N j, Y, P e" }} to {{ end|date:"N j, Y, P e" }}{% endif %}
+{% if clock_24_hours %}{% if timezone %}{{ start|timezone:timezone|date:"N j, Y, H:i e" }} to {{ end|timezone:timezone|date:"N j, Y, H:i e" }}{% else %}{{ start|date:"N j, Y, H:i e" }} to {{ end|date:"N j, Y, H:i e" }}{% endif %}{% else %}{% if timezone %}{{ start|timezone:timezone|date:"N j, Y, P e" }} to {{ end|timezone:timezone|date:"N j, Y, P e" }}{% else %}{{ start|date:"N j, Y, P e" }} to {{ end|date:"N j, Y, P e" }}{% endif %}{% endif %}
 
 {% for rule, groups in digest.items %}{{ rule.label }}
 {% for group, records in groups.items %}{% with event_count=event_counts|get_item:group.id user_count=user_counts|get_item:group.id %}

src/sentry/templates/sentry/emails/feedback.html

@@ -67,11 +67,13 @@ <h2 {% if notification_reason %}style="margin-bottom: 4px"{% else %}style="margi
     {% if enhanced_privacy %}
       <div class="event">
         <div class="event-id">ID: {{ event.event_id }}</div>
-          {% if timezone %}
-            <div class="event-date">{{ event.datetime|timezone:timezone|date:"N j, Y, g:i:s a e"}}</div>
-          {% else %}
-            <div class="event-date">{{ event.datetime|date:"N j, Y, g:i:s a e"}}</div>
-          {% endif %}
+          <div class="event-date">
+            {% if clock_24_hours %}
+              {% if timezone %}{{ event.datetime|timezone:timezone|date:"N j, Y, H:i:s e"}}{% else %}{{ event.datetime|date:"N j, Y, H:i:s e"}}{% endif %}
+            {% else %}
+              {% if timezone %}{{ event.datetime|timezone:timezone|date:"N j, Y, g:i:s a e"}}{% else %}{{ event.datetime|date:"N j, Y, g:i:s a e"}}{% endif %}
+            {% endif %}
+          </div>
       </div>
 
       <div class="notice">Details about this feedback are not shown in this notification since enhanced privacy
@@ -101,11 +103,13 @@ <h3>Message</h3>
                       {% endif %}
                       <div class="event">
                         <div class="event-id">ID: {{ event.event_id }}</div>
-                        {% if timezone %}
-                            <div class="event-date">{{ event.datetime|timezone:timezone|date:"N j, Y, g:i:s a e"}}</div>
-                        {% else %}
-                            <div class="event-date">{{ event.datetime|date:"N j, Y, g:i:s a e"}}</div>
-                        {% endif %}
+                        <div class="event-date">
+                          {% if clock_24_hours %}
+                            {% if timezone %}{{ event.datetime|timezone:timezone|date:"N j, Y, H:i:s e"}}{% else %}{{ event.datetime|date:"N j, Y, H:i:s e"}}{% endif %}
+                          {% else %}
+                            {% if timezone %}{{ event.datetime|timezone:timezone|date:"N j, Y, g:i:s a e"}}{% else %}{{ event.datetime|date:"N j, Y, g:i:s a e"}}{% endif %}
+                          {% endif %}
+                        </div>
                       </div>
                   </div>
               {% endwith %}

src/sentry/templates/sentry/emails/issue_alert_base.html

@@ -80,11 +80,13 @@ <h2 {% if notification_reason %}style="margin-bottom: 4px"{% else %}style="margi
     {% if enhanced_privacy %}
       <div class="event">
         <div class="event-id">ID: {{ event.event_id }}</div>
-          {% if timezone %}
-            <div class="event-date">{{ event.datetime|timezone:timezone|date:"N j, Y, g:i:s a e"}}</div>
-          {% else %}
-            <div class="event-date">{{ event.datetime|date:"N j, Y, g:i:s a e"}}</div>
-          {% endif %}
+          <div class="event-date">
+            {% if clock_24_hours %}
+              {% if timezone %}{{ event.datetime|timezone:timezone|date:"N j, Y, H:i:s e"}}{% else %}{{ event.datetime|date:"N j, Y, H:i:s e"}}{% endif %}
+            {% else %}
+              {% if timezone %}{{ event.datetime|timezone:timezone|date:"N j, Y, g:i:s a e"}}{% else %}{{ event.datetime|date:"N j, Y, g:i:s a e"}}{% endif %}
+            {% endif %}
+          </div>
       </div>
 
       <div class="notice">Details about this issue are not shown in this notification since enhanced privacy
@@ -163,11 +165,13 @@ <h3>
       {% if not is_new_design %}
         <div class="event">
           <div class="event-id">ID: {{ event.event_id }}</div>
-            {% if timezone %}
-                <div class="event-date">{{ event.datetime|timezone:timezone|date:"N j, Y, g:i:s a e"}}</div>
-            {% else %}
-                <div class="event-date">{{ event.datetime|date:"N j, Y, g:i:s a e"}}</div>
-            {% endif %}
+            <div class="event-date">
+              {% if clock_24_hours %}
+                {% if timezone %}{{ event.datetime|timezone:timezone|date:"N j, Y, H:i:s e"}}{% else %}{{ event.datetime|date:"N j, Y, H:i:s e"}}{% endif %}
+              {% else %}
+                {% if timezone %}{{ event.datetime|timezone:timezone|date:"N j, Y, g:i:s a e"}}{% else %}{{ event.datetime|date:"N j, Y, g:i:s a e"}}{% endif %}
+              {% endif %}
+            </div>
         </div>
       {% endif %}
 
@@ -206,10 +210,10 @@ <h3>
               <tr>
                 <th>Start Time</th>
                 <td>
-                  {% if timezone %}
-                    {{ event.datetime|timezone:timezone|date:"N j, Y, g:i:s a e"}}
+                  {% if clock_24_hours %}
+                    {% if timezone %}{{ event.datetime|timezone:timezone|date:"N j, Y, H:i:s e"}}{% else %}{{ event.datetime|date:"N j, Y, H:i:s e"}}{% endif %}
                   {% else %}
-                    {{ event.datetime|date:"N j, Y, g:i:s a e"}}
+                    {% if timezone %}{{ event.datetime|timezone:timezone|date:"N j, Y, g:i:s a e"}}{% else %}{{ event.datetime|date:"N j, Y, g:i:s a e"}}{% endif %}
                   {% endif %}
                 </td>
               </tr>

tests/sentry/mail/test_adapter.py

@@ -764,18 +764,20 @@ def test_notify_users_with_utf8_subject(self) -> None:
         msg = mail.outbox[0]
         assert msg.subject == "[Sentry] BAR-1 - רונית מגן"
 
-    def test_notify_users_with_their_timezones(self) -> None:
+    def test_notify_users_with_their_time_preferences(self) -> None:
         """
-        Test that ensures that datetime in issue alert email is in the user's timezone
+        Test that ensures that datetime in issue alert email is in the user's timezone, and their
+        preferred clock format (24h or 12h)
         """
         from django.template.defaultfilters import date
 
         timestamp = timezone.now()
         local_timestamp_s = timezone.localtime(timestamp, zoneinfo.ZoneInfo("Europe/Vienna"))
-        local_timestamp = date(local_timestamp_s, "N j, Y, g:i:s a e")
+        local_timestamp_24h = date(local_timestamp_s, "N j, Y, H:i:s e")
 
         with assume_test_silo_mode(SiloMode.CONTROL):
             UserOption.objects.create(user=self.user, key="timezone", value="Europe/Vienna")
+            UserOption.objects.create(user=self.user, key="clock_24_hours", value=True)
 
         event = self.store_event(
             data={"message": "foobar", "level": "error", "timestamp": timestamp.isoformat()},
@@ -795,7 +797,14 @@ def test_notify_users_with_their_timezones(self) -> None:
         assert len(mail.outbox) == 1
         msg = mail.outbox[0]
         assert isinstance(msg, EmailMultiAlternatives)
-        assert local_timestamp in str(msg.alternatives)
+        assert local_timestamp_24h in str(msg.alternatives)
+
+        alert_notification = AlertRuleNotification(notification, ActionTargetType.ISSUE_OWNERS)
+        recipient_context = alert_notification.get_recipient_context(
+            Actor.from_orm_user(self.user), {}
+        )
+        assert recipient_context["timezone"] == zoneinfo.ZoneInfo("Europe/Vienna")
+        assert recipient_context["clock_24_hours"] is True
 
     def _test_invalid_timezone(self, s: str) -> None:
         with assume_test_silo_mode(SiloMode.CONTROL):
@@ -817,6 +826,17 @@ def test_context_invalid_timezone_empty_string(self) -> None:
     def test_context_invalid_timezone_garbage_value(self) -> None:
         self._test_invalid_timezone("not/a/real/timezone")
 
+    def test_recipient_context_clock_24_hours_false_by_default(self) -> None:
+        event = self.store_event(
+            data={"message": "foobar", "level": "error"},
+            project_id=self.project.id,
+        )
+        notification = AlertRuleNotification(
+            Notification(event=event), ActionTargetType.ISSUE_OWNERS
+        )
+        recipient_context = notification.get_recipient_context(Actor.from_orm_user(self.user), {})
+        assert recipient_context["clock_24_hours"] is False
+
     def test_notify_with_suspect_commits(self) -> None:
         repo = Repository.objects.create(
             organization_id=self.organization.id, name=self.organization.id