From 4459fa2e78e62a7aaff12cba4736b179dcd112c7 Mon Sep 17 00:00:00 2001
From: Julian Leucker <leuckerj@gmail.com>
Date: Sun, 20 Mar 2022 23:52:03 +0100
Subject: [PATCH] Beautify code in feeds.py
---
aleksis/core/feeds.py | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/aleksis/core/feeds.py b/aleksis/core/feeds.py
index 546d7afa6..3c21a3091 100644
--- a/aleksis/core/feeds.py
+++ b/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),
}
--
GitLab