Skip to content
Snippets Groups Projects
Verified Commit 6e733cf6 authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Merge branch 'master' into feature/support-date-for-period-time-start-end

parents 04b1a0fa dc8f32f2
No related branches found
No related tags found
No related merge requests found
......@@ -14,6 +14,11 @@ Changed
* Support dates for ``TimePeriod.get_datetime_start`` and ``TimePeriod.get_datetime_end``.
Fixed
~~~~~
* ``Event.__str__`` returned a proxy type instead a string.
`2.0rc2`_ - 2021-08-01
----------
......
......@@ -986,7 +986,7 @@ class Event(SchoolTermRelatedExtensibleModel, GroupPropertiesMixin, TeacherPrope
if self.title:
return self.title
else:
return _(f"Event {self.pk}")
return _("Event {pk}").format(pk=self.pk)
@property
def raw_period_from_on_day(self) -> TimePeriod:
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment