diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 1ce0823..dd3ddb0 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-08-02 10:50+0200\n" +"POT-Creation-Date: 2023-03-15 19:43+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1697,7 +1697,7 @@ msgstr "" #: bla/lib/python3.7/site-packages/wagtailvideos/models.py:84 #: mpicms/base/models.py:46 mpicms/personal/models.py:68 -#: mpicms/personal/models.py:95 mpicms/publications/models.py:23 +#: mpicms/personal/models.py:95 mpicms/publications/models.py:26 msgid "title" msgstr "Titel" @@ -2155,19 +2155,19 @@ msgstr "Raum" msgid "event dates" msgstr "Veranstaltungsdaten" -#: mpicms/events/models.py:96 +#: mpicms/events/models.py:101 msgid "event" msgstr "Veranstaltung" -#: mpicms/events/models.py:97 +#: mpicms/events/models.py:102 msgid "events" msgstr "Veranstaltungen" -#: mpicms/events/models.py:138 +#: mpicms/events/models.py:143 msgid "event index" msgstr "Veranstaltungs-Index" -#: mpicms/events/models.py:139 +#: mpicms/events/models.py:144 msgid "event indexes" msgstr "Veranstaltungs-Indexes" @@ -2192,7 +2192,7 @@ msgid "news entries" msgstr "Neuigkeiten" #: mpicms/personal/models.py:25 mpicms/personal/models.py:31 -#: mpicms/publications/models.py:24 +#: mpicms/publications/models.py:27 msgid "groups" msgstr "Gruppen" @@ -2259,11 +2259,11 @@ msgstr "Gruppen" msgid "Positions" msgstr "Positionen" -#: mpicms/publications/models.py:25 +#: mpicms/publications/models.py:28 msgid "authors" msgstr "Autoren" -#: mpicms/publications/models.py:26 +#: mpicms/publications/models.py:29 msgid "source" msgstr "Quellen" @@ -2386,7 +2386,7 @@ msgstr "Email-Adresse" msgid "Phone" msgstr "Telefon" -#: mpicms/templates/publications/components/list.html:25 +#: mpicms/templates/publications/components/list.html:24 msgid "More in PuRe" msgstr "Mehr in PuRe" diff --git a/mpicms/events/models.py b/mpicms/events/models.py index 72d8c9c..f7347f5 100644 --- a/mpicms/events/models.py +++ b/mpicms/events/models.py @@ -1,5 +1,5 @@ import json -from datetime import datetime, date +from datetime import datetime, date, timedelta from ics import Calendar, Event as ICSEvent from django.db import models @@ -71,10 +71,15 @@ def end(self): return self.end_date def get_dict(self, request=None): + + datetime_end = self.end + if self.end_date and not self.end_time: + datetime_end += timedelta(days = 1) + return { 'title': self.title, 'start': self.start.isoformat(), - 'end': self.end.isoformat() if self.end else None, + 'end': datetime_end.isoformat() if self.end else None, 'url': self.get_url(request=request), } @@ -131,7 +136,7 @@ def ics(self): if type(event.start) is date: e.make_all_day() c.events.add(e) - return '\n'.join(c) + return c class Meta: # noqa diff --git a/mpicms/personal/wagtail_hooks.py b/mpicms/personal/wagtail_hooks.py index d82fd56..0548aa9 100644 --- a/mpicms/personal/wagtail_hooks.py +++ b/mpicms/personal/wagtail_hooks.py @@ -86,5 +86,3 @@ class ContactGroup(ModelAdminGroup): modeladmin_register(ContactGroup) -# modeladmin_register(ContactAdmin) -# modeladmin_register(GroupAdmin)