Add sentence about cancel deadline being in the past to member waiting list notification

website/activemembers/models.py

@@ -95,6 +95,12 @@ class MemberGroup(models.Model, metaclass=ModelTranslateMeta):
         on_delete=models.SET_NULL,
     )
 
+    @property
+    def contact_address(self):
+        if self.contact_mailinglist:
+            return f"{self.contact_mailinglist.name}@thalia.nu"
+        return self.contact_email
+
     def clean(self):
         if ((self.contact_email is not None and
                 self.contact_mailinglist is not None) or

website/events/locale/nl/LC_MESSAGES/django.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-12 19:42+0100\n"
-"PO-Revision-Date: 2018-12-12 19:42+0100\n"
+"POT-Creation-Date: 2019-01-01 15:30+0100\n"
+"PO-Revision-Date: 2019-01-01 15:33+0100\n"
 "Last-Translator: Thom Wiggers <thom@thomwiggers.nl>\n"
 "Language-Team: \n"
 "Language: nl\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Poedit 2.2\n"
 
 #: admin.py
 msgid "lecture year"
@@ -328,6 +328,10 @@ msgstr "De starttijd voor de aanmeldperiode moet voor de eindtijd liggen"
 msgid "This organiser does not have a contact mailinglist."
 msgstr "De organisator heeft geen contact mailinglijst."
 
+#: models.py
+msgid "You cannot change this field after the registration has started."
+msgstr "Je kunt dit veld niet aanpassen nadat de registratie is gestart."
+
 #: models.py
 msgid "No payment"
 msgstr "Niet betaald"
@@ -787,6 +791,8 @@ msgid ""
 "\n"
 "We're assuming that you'll be there, but you're still able to unregister "
 "until %(cancel_deadline)s.\n"
+"If this date has already passed you can contact the %(organiser_name)s via "
+"%(organiser_mail)s.\n"
 "\n"
 "Best regards,\n"
 "Study Association Thalia"
@@ -801,6 +807,8 @@ msgstr ""
 "\n"
 "We gaan ervan uit dat je erbij bent, maar tot %(cancel_deadline)s kan je je "
 "nog afmelden.\n"
+"Als deze datum al is geweest dan kun je contact opnemen met de "
+"%(organiser_name)s via %(organiser_mail)s.\n"
 "\n"
 "Met vriendelijke groet,\n"
 "Studievereniging Thalia"

website/events/templates/events/member_email.txt

-{% load i18n %}{% blocktrans with event_title=event.title baseurl=base_url event_url=event.get_absolute_url registration_date=registration.date|date:"SHORT_DATETIME_FORMAT" cancel_deadline=event.cancel_deadline|date:"SHORT_DATETIME_FORMAT" name=member.first_name %}Hi {{ name }},
+{% load i18n %}{% blocktrans with event_title=event.title baseurl=base_url event_url=event.get_absolute_url registration_date=registration.date|date:"SHORT_DATETIME_FORMAT" cancel_deadline=event.cancel_deadline|date:"SHORT_DATETIME_FORMAT" name=member.first_name organiser_name=event.organiser.name organiser_mail=event.organiser.contact_address %}Hi {{ name }},
 
 You registered for the event '{{ event_title }}' on {{ registration_date }} and unfortunately you were placed on the waiting list.
 However someone just unregistered and we would like to let you know that you'll be able to attend now!
@@ -6,6 +6,7 @@ However someone just unregistered and we would like to let you know that you'll
 You can find more information about the event on the website: {{ baseurl }}{{ event_url }}
 
 We're assuming that you'll be there, but you're still able to unregister until {{ cancel_deadline }}.
+If this date has already passed you can contact the {{ organiser_name }} via {{ organiser_mail }}.
 
 Best regards,
 Study Association Thalia{% endblocktrans %}