Merge pull request #1102 from opengisch/QF-5031-fix-missing-tz

Fix missing timezones
opengisch · Jan 8, 2025 · 3c9290a · 3c9290a
2 parents e62ed6c + 06ddccc
commit 3c9290a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/docker-app/Dockerfile b/docker-app/Dockerfile
@@ -49,7 +49,9 @@ RUN apt-get update && apt-get install -y \
 # needed for Django's `manage.py makemessages`
     gettext \
 # for development purposes only (optional dependency for `django-extensions`)
-    graphviz
+    graphviz \
+# timezone data used by python to determine the user's timezone
+    tzdata
 
 # copy the dependencies
 COPY --from=build /usr/local/lib/python3.10/site-packages/ /usr/local/lib/python3.10/site-packages/

diff --git a/docker-app/qfieldcloud/core/middleware/timezone.py b/docker-app/qfieldcloud/core/middleware/timezone.py
@@ -1,4 +1,4 @@
-import pytz
+import zoneinfo
 from django.conf import settings
 from django.utils import timezone
 
@@ -13,7 +13,7 @@ def __call__(self, request):
         ):
             user_tz = request.user.useraccount.timezone
         elif settings.TIME_ZONE:
-            user_tz = pytz.timezone(settings.TIME_ZONE)
+            user_tz = zoneinfo.ZoneInfo(settings.TIME_ZONE)
         else:
             user_tz = None