diff --git a/app/formatters.py b/app/formatters.py
index c63b14776..2bb8854f3 100644
--- a/app/formatters.py
+++ b/app/formatters.py
@@ -22,7 +22,7 @@ from notifications_utils.recipients import InvalidPhoneError, validate_phone_num
from notifications_utils.take import Take
from app.utils.csv import get_user_preferred_timezone
-from app.utils.time import parse_naive_dt
+from app.utils.time import parse_dt, parse_naive_dt
def apply_html_class(tags, html_file):
@@ -99,12 +99,10 @@ def format_datetime_table(date):
def format_time_12h(date):
- date = parse_naive_dt(date)
+ date = parse_dt(date)
preferred_tz = pytz.timezone(get_user_preferred_timezone())
- return (
- date.replace(tzinfo=timezone.utc).astimezone(preferred_tz).strftime("%I:%M %p")
- )
+ return date.astimezone(preferred_tz).strftime("%I:%M %p")
def format_datetime_relative(date):
diff --git a/app/templates/views/check/preview.html b/app/templates/views/check/preview.html
index ebf2ec8c2..393516336 100644
--- a/app/templates/views/check/preview.html
+++ b/app/templates/views/check/preview.html
@@ -21,7 +21,7 @@
{{ page_header('Preview') }}
-
Scheduled: {{ scheduled_for if scheduled_for else 'Now'}}
+
Scheduled: {{ scheduled_for |format_datetime_normal if scheduled_for else 'Now'}}
File: {{original_file_name}}
Template: {{template.name}}
From: {{ template.sender }}
diff --git a/app/templates/views/notifications/preview.html b/app/templates/views/notifications/preview.html
index a22fda5bb..e07435c1a 100644
--- a/app/templates/views/notifications/preview.html
+++ b/app/templates/views/notifications/preview.html
@@ -43,7 +43,7 @@
{{ page_header('Preview') }}
{% endif %}
-
Scheduled: {{ scheduled_for if scheduled_for else 'Now'}}
+
Scheduled: {{ scheduled_for |format_datetime_normal if scheduled_for else 'Now'}}
Template: {{template.name}}
From: {{ template.sender }}
To: {{ recipient }}
diff --git a/app/utils/time.py b/app/utils/time.py
index 9ae24b1bd..05f190f15 100644
--- a/app/utils/time.py
+++ b/app/utils/time.py
@@ -22,3 +22,8 @@ def is_less_than_days_ago(date_from_db, number_of_days):
def parse_naive_dt(dt):
return parser.parse(dt, ignoretz=True)
+
+
+def parse_dt(dt):
+ # Parse datetime without ignoring the timezone
+ return parser.parse(dt)