aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlban Gruin2018-01-23 22:07:43 +0100
committerAlban Gruin2018-01-23 22:07:43 +0100
commit88d537092fa6e7710b7c3b07c71b94d68140a5c2 (patch)
tree74020e478c7d587fae6d5038c71b08a791a527b4
parent2a7292acd38ffc1261fe4800a15db5a27a6c871a (diff)
parent94e35d0018cc1210594a08f33ffc27ecfd5bb7ba (diff)
Merge branch 'stable/0.12.z' into prod/pa1ch/0.12.zv0.12.2-pa1ch
-rw-r--r--__init__.py2
-rw-r--r--feeds.py7
2 files changed, 5 insertions, 4 deletions
diff --git a/__init__.py b/__init__.py
index fa86ac8..71cc55e 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,7 +13,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with celcatsanitizer. If not, see <http://www.gnu.org/licenses/>.
-VERSION = "0.12.1-pa1ch"
+VERSION = "0.12.2-pa1ch"
__version__ = VERSION
default_app_config = "edt.apps.EdtConfig"
diff --git a/feeds.py b/feeds.py
index aced5e6..da077f0 100644
--- a/feeds.py
+++ b/feeds.py
@@ -21,6 +21,7 @@ from django.db.models.functions import ExtractWeek, ExtractYear
from django.template import loader
from django.urls import reverse
from django.utils.feedgenerator import Atom1Feed, SyndicationFeed
+from django.utils.timezone import localtime
from icalendar import Calendar, Event
@@ -85,9 +86,9 @@ class IcalFeed(Feed):
def item_extra_kwargs(self, item):
return {"uid": "{0}@celcatsanitizer".format(item.id),
- "dtstart": item.begin,
- "dtend": item.end,
- "dtstamp": item.last_update,
+ "dtstart": localtime(item.begin),
+ "dtend": localtime(item.end),
+ "dtstamp": localtime(item.last_update),
"summary": self.item_summary(item),
"location": format_rooms(item.rooms.all())}