From c54dcae9eda2f41c53ac601f65bfa7e3602f6d4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Sun, 27 Oct 2019 17:18:39 +0100 Subject: [PATCH] templatetags: get timezoned now() instead of converting it afterwards (#37235) --- combo_plugin_gnm/templatetags/gnm.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/combo_plugin_gnm/templatetags/gnm.py b/combo_plugin_gnm/templatetags/gnm.py index b2df54f..43f819c 100644 --- a/combo_plugin_gnm/templatetags/gnm.py +++ b/combo_plugin_gnm/templatetags/gnm.py @@ -36,7 +36,7 @@ from django.utils.dateparse import parse_datetime from django.utils.http import quote from django.utils.html import format_html from django.utils.text import slugify -from django.utils.timezone import is_naive, make_aware +from django.utils.timezone import now, is_naive, make_aware from django.utils.safestring import mark_safe from combo.apps.dashboard.models import DashboardCell, Tile @@ -242,7 +242,7 @@ def get_mairie_opening_hours(mairie_data): if 'properties' in mairie_data: mairie_data = mairie_data['properties'] - base_datetime = make_aware(datetime.datetime.now()) + base_datetime = now() days_list = [] opening_hours_dict = OrderedDict(zip(EN_ABBREV_WEEKDAYS_LIST, [{ 'am': None, 'pm': None @@ -298,7 +298,7 @@ def as_opening_hours_badge(data): if not data: return '' - base_datetime = make_aware(datetime.datetime.now()) + base_datetime = now() exclusion_slots = [] today = base_datetime.date() (slots, known_format) = get_slots_from_mdr_format(data, base_datetime)