From b35cc1f28b911afe2e1f1bcea4e72b6a03003a64 Mon Sep 17 00:00:00 2001 From: "marius.klein" Date: Fri, 25 Jul 2025 21:29:18 +0200 Subject: [PATCH] feat(members/waitinglist): add group age range info to invite text (#168) Pass age info to group invite text as a parameter. Reviewed-by: Christian Merten Co-authored-by: marius.klein Co-committed-by: marius.klein --- jdav_web/members/locale/de/LC_MESSAGES/django.po | 11 ++++++++++- jdav_web/members/models.py | 15 +++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/jdav_web/members/locale/de/LC_MESSAGES/django.po b/jdav_web/members/locale/de/LC_MESSAGES/django.po index 62fca9d..d231df7 100644 --- a/jdav_web/members/locale/de/LC_MESSAGES/django.po +++ b/jdav_web/members/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-06-22 13:36+0200\n" +"POT-Creation-Date: 2025-07-25 18:44+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -604,6 +604,15 @@ msgstr "Gruppe" msgid "groups" msgstr "Gruppen" +#: members/models.py +#, python-format +msgid "years %(from)s to %(to)s" +msgstr "Jahrgang %(from)s bis %(to)s" + +#: members/models.py +msgid "no information available" +msgstr "keine Angabe" + #: members/models.py msgid "prename" msgstr "Vorname" diff --git a/jdav_web/members/models.py b/jdav_web/members/models.py index 5b3d28c..d48bccd 100644 --- a/jdav_web/members/models.py +++ b/jdav_web/members/models.py @@ -124,6 +124,15 @@ class Group(models.Model): end_time=self.end_time.strftime('%H:%M')) else: return "" + + def has_age_info(self): + return self.year_from and self.year_to + + def get_age_info(self): + if self.has_age_info(): + return _("years %(from)s to %(to)s") % {'from':self.year_from, 'to':self.year_to} + else: + return "" def get_invitation_text_template(self): """The text template used to invite waiters to this group. This contains @@ -136,8 +145,14 @@ class Group(models.Model): group_time = self.get_time_info() else: group_time = settings.GROUP_TIME_UNAVAILABLE_TEXT.format(contact_email=self.contact_email) + if self.has_age_info(): + group_age = self.get_age_info() + else: + group_age = _("no information available") + return settings.INVITE_TEXT.format(group_time=group_time, group_name=self.name, + group_age=group_age, group_link=group_link, contact_email=self.contact_email)