Fix RecurringRule and OccurringRule model __str__ method

python · JacobCoffee · Sep 13, 2024 · Oct 25, 2022 · Sep 12, 2024 · Sep 12, 2024
commit da3a02f7ff65e2c7e21e1190b5d8c2e529f6decf
@@ -237,7 +237,10 @@ class OccurringRule(RuleMixin, models.Model):
 
     def __str__(self):
         strftime = settings.SHORT_DATETIME_FORMAT
-        return f'{self.event.title} {date(self.dt_start.strftime, strftime)} - {date(self.dt_end.strftime, strftime)}'
+        return (
+            f'{self.event.title} {date(self.dt_start, strftime)} - '
+            f'{date(self.dt_end, strftime)}'
+        )
 
     @property
     def begin(self):
@@ -283,8 +286,11 @@ class RecurringRule(RuleMixin, models.Model):
     all_day = models.BooleanField(default=False)
 
     def __str__(self):
-        strftime = settings.SHORT_DATETIME_FORMAT
-        return f'{self.event.title} every {timedelta_nice_repr(self.interval)} since {date(self.dt_start.strftime, strftime)}'
+        return (
+            f'{self.event.title} every '
+            f'{timedelta_nice_repr(self.freq_interval_as_timedelta)} since '
+            f'{date(self.dt_start, settings.SHORT_DATETIME_FORMAT)}'
+        )
 
     def to_rrule(self):
         return rrule(