Merge pull request #26 from molgen/fix-event-timezones

events: Fill ics calendar with TZ-aware datetimes
molgen · Nov 11, 2019 · fc46f27 · fc46f27
2 parents a70b757 + f8f5353
commit fc46f27
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/mpicms/events/models.py b/mpicms/events/models.py
@@ -58,14 +58,14 @@ class Event(BodyMixin, BasePage):
     @property
     def start(self):
         if self.start_time:
-            return datetime.combine(self.start_date, self.start_time)
+            return datetime.combine(self.start_date, self.start_time).astimezone()
         return self.start_date
 
     @property
     def end(self):
         if self.end_time:
             date = self.end_date or self.start_date
-            return datetime.combine(date, self.end_time)
+            return datetime.combine(date, self.end_time).astimezone()
         return self.end_date
 
     def get_dict(self, request=None):