Beautify code in feeds.py

aleksis/core/feeds.py

@@ -16,14 +16,15 @@ class PersonalICalFeedBase(ICalFeed):
     @property
     def product_id(self):
         lang = self.request.LANGUAGE_CODE
-        return f"-//AlekSIS®//{get_site_preferences()['general__title']}//{lang}"
+        title = get_site_preferences()['general__title']
+        return f"-//AlekSIS//{title}//{lang}"
 
     link = settings.BASE_URL
     timezone = settings.TIME_ZONE
     person = None
     request = None
 
-    def get_object(self, request: WSGIRequest, *args: Any, **kwargs: Any) -> None:
+    def get_object(self, request, *args, **kwargs):
         if kwargs.get("person"):
             self.person = kwargs.pop("person")
         self.request = request
@@ -60,15 +61,13 @@ class BirthdayFeed(PersonalICalFeedBase):
         )
 
     def item_title(self, item: "models.Person"):
-        return _("%(first_name)s %(last_name)s's birthday") % {
-            "first_name": item.first_name,
-            "last_name": item.last_name,
+        return _("%(name)s's birthday") % {
+            "name": item.addressing_name,
         }
 
     def item_description(self, item: "models.Person"):
-        return _("%(first_name)s %(last_name)s was born on %(birthday)s") % {
-            "first_name": item.first_name,
-            "last_name": item.last_name,
+        return _("%(name)s was born on %(birthday)s") % {
+            "name": item.addressing_name,
             "birthday": date_format(item.date_of_birth),
         }