diff --git a/app/templates/flask_ext/jinja/filters.py b/app/templates/flask_ext/jinja/filters.py
index 012150b58c..0bc8f57f66 100644
--- a/app/templates/flask_ext/jinja/filters.py
+++ b/app/templates/flask_ext/jinja/filters.py
@@ -24,8 +24,10 @@ def money_filter(string):
return '{:20,.2f}'.format(float(string))
@app.template_filter('datetime')
- def simple_datetime_display(date):
- return date.strftime('%B %d, %Y %I:%M %p')
+ def simple_datetime_display(date, timezone='UTC', format='%B %d, %Y %I:%M %p'):
+ if not date:
+ return ''
+ return date.astimezone(pytz.timezone(timezone)).strftime(format)
@app.template_filter('date')
def simple_date_display(date):
diff --git a/app/templates/pdf/ticket_attendee.html b/app/templates/pdf/ticket_attendee.html
index efa987291b..0a68315c53 100644
--- a/app/templates/pdf/ticket_attendee.html
+++ b/app/templates/pdf/ticket_attendee.html
@@ -50,7 +50,8 @@
{{order.event.location_name }}
Date and Time
- {{ order.event.starts_at.strftime('%H:%M %Z') }} to {{ order.event.ends_at.strftime('%H:%M %Z') }}
+ From: {{ order.event.starts_at | datetime(order.event.timezone) }}
+ To: {{ order.event.ends_at | datetime(order.event.timezone) }}
Type
diff --git a/app/templates/pdf/ticket_purchaser.html b/app/templates/pdf/ticket_purchaser.html
index d4016678bd..0c443157b6 100644
--- a/app/templates/pdf/ticket_purchaser.html
+++ b/app/templates/pdf/ticket_purchaser.html
@@ -51,8 +51,8 @@
{{ order.event.location_name }}
Date and Time
- From: {{ order.event.starts_at.strftime("%H:%M %Z") }} on {{ order.event.starts_at.date() }}
- To: {{ order.event.ends_at.strftime("%H:%M %Z") }} on {{ order.event.ends_at.date() }}
+ From: {{ order.event.starts_at | datetime(order.event.timezone) }}
+ To: {{ order.event.ends_at | datetime(order.event.timezone) }}
Type