From 4ba734ccf05b13b8a947e5e114667ff35bf9c4ec Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Thu, 23 Sep 2021 16:24:45 +0200
Subject: [PATCH] Force __str__ methods of models to return str types instead
of proxy types
(cherry picked from commit bdb9ee9aeacc69e7c80185186d0f099286d04946)
---
CHANGELOG.rst | 5 +++++
aleksis/apps/chronos/models.py | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 4f70bb71..1c504e30 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -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
----------
diff --git a/aleksis/apps/chronos/models.py b/aleksis/apps/chronos/models.py
index 9d51ac7a..aaeaf583 100644
--- a/aleksis/apps/chronos/models.py
+++ b/aleksis/apps/chronos/models.py
@@ -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:
--
GitLab