From 4386ae268ac3aab39a3a79c5f1055a5b6a9aab0b Mon Sep 17 00:00:00 2001 From: flavis Date: Wed, 12 Jan 2022 17:41:41 +0100 Subject: [PATCH] add check to control whether mails are also sent to parents --- jdav_web/locale/de/LC_MESSAGES/django.po | 2 +- .../mailer/locale/de/LC_MESSAGES/django.po | 34 ++++---- jdav_web/mailer/models.py | 2 +- .../material/locale/de/LC_MESSAGES/django.po | 2 +- jdav_web/members/admin.py | 2 +- .../members/locale/de/LC_MESSAGES/django.po | 84 ++++++++++--------- jdav_web/members/models.py | 1 + .../startpage/locale/de/LC_MESSAGES/django.po | 2 +- 8 files changed, 67 insertions(+), 62 deletions(-) diff --git a/jdav_web/locale/de/LC_MESSAGES/django.po b/jdav_web/locale/de/LC_MESSAGES/django.po index ecb9b0f..d45a19b 100644 --- a/jdav_web/locale/de/LC_MESSAGES/django.po +++ b/jdav_web/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: 2021-09-24 12:24+0200\n" +"POT-Creation-Date: 2022-01-12 17:38+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/jdav_web/mailer/locale/de/LC_MESSAGES/django.po b/jdav_web/mailer/locale/de/LC_MESSAGES/django.po index dd2df63..23d6de6 100644 --- a/jdav_web/mailer/locale/de/LC_MESSAGES/django.po +++ b/jdav_web/mailer/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: 2021-09-24 12:24+0200\n" +"POT-Creation-Date: 2022-01-12 17:38+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -84,54 +84,54 @@ msgstr "An Gruppe" msgid "to freizeit" msgstr "An Freizeit" -#: mailer/models.py:77 +#: mailer/models.py:78 msgid "to notes list" msgstr "An Notizliste" -#: mailer/models.py:81 +#: mailer/models.py:83 msgid "to member" msgstr "An Teilnehmer" -#: mailer/models.py:84 +#: mailer/models.py:86 msgid "reply to participant" msgstr "Antwort an Teilnehmer" -#: mailer/models.py:88 +#: mailer/models.py:90 msgid "reply to custom email address" msgstr "Antwort an Email-Adresse" -#: mailer/models.py:91 +#: mailer/models.py:93 msgid "sent" msgstr "Gesendet" -#: mailer/models.py:105 +#: mailer/models.py:107 msgid "Some other members" msgstr "Andere Teilnehmer" -#: mailer/models.py:107 +#: mailer/models.py:109 msgid "recipients" msgstr "Empfänger" -#: mailer/models.py:166 +#: mailer/models.py:168 msgid "message" msgstr "Nachricht" -#: mailer/models.py:167 +#: mailer/models.py:169 msgid "messages" msgstr "Nachrichten" -#: mailer/models.py:169 +#: mailer/models.py:171 msgid "Can submit mails" msgstr "Kann Mails verschicken" -#: mailer/models.py:185 +#: mailer/models.py:187 msgid "" "Either a group, a memberlist or at least one member is required as recipient" msgstr "" "Es muss entweder eine Gruppe, eine Teilnehmerliste oder mindestens ein " "Teilnehmer als Empfänger ausgewählt werden." -#: mailer/models.py:190 +#: mailer/models.py:192 msgid "" "At least one reply-to recipient is required. Use the info mail if you really " "want no reply-to recipient." @@ -139,19 +139,19 @@ msgstr "" "Es muss mindestens ein Antwort-An Empfänger angegeben werden. Nutze die info " "Email-Adresse falls du wirklich keinen Antwort-An Empfänger haben möchtest." -#: mailer/models.py:197 +#: mailer/models.py:199 msgid "file" msgstr "Datei" -#: mailer/models.py:203 +#: mailer/models.py:205 msgid "Empty" msgstr "Leer" -#: mailer/models.py:206 +#: mailer/models.py:208 msgid "attachment" msgstr "Anhang" -#: mailer/models.py:207 +#: mailer/models.py:209 msgid "attachments" msgstr "Anhänge" diff --git a/jdav_web/mailer/models.py b/jdav_web/mailer/models.py index b50fd34..5038f26 100644 --- a/jdav_web/mailer/models.py +++ b/jdav_web/mailer/models.py @@ -132,7 +132,7 @@ class Message(models.Model): if a.f.name] emails = [member.email for member in filtered] emails.extend([member.email_parents for member in filtered - if member.email_parents]) + if member.email_parents and member.cc_email_parents]) # remove any underscores from subject to prevent Arne from using # terrible looking underscores in subjects self.subject = self.subject.replace('_', ' ') diff --git a/jdav_web/material/locale/de/LC_MESSAGES/django.po b/jdav_web/material/locale/de/LC_MESSAGES/django.po index d410db3..8774727 100644 --- a/jdav_web/material/locale/de/LC_MESSAGES/django.po +++ b/jdav_web/material/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: 2021-09-24 12:24+0200\n" +"POT-Creation-Date: 2022-01-12 17:38+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/jdav_web/members/admin.py b/jdav_web/members/admin.py index c52b1f7..e830af9 100644 --- a/jdav_web/members/admin.py +++ b/jdav_web/members/admin.py @@ -66,7 +66,7 @@ class RegistrationFilter(admin.SimpleListFilter): # Register your models here. class MemberAdmin(admin.ModelAdmin): - fields = ['prename', 'lastname', 'email', 'email_parents', 'street', 'plz', + fields = ['prename', 'lastname', 'email', 'email_parents', 'cc_email_parents', 'street', 'plz', 'town', 'phone_number', 'phone_number_parents', 'birth_date', 'group', 'gets_newsletter', 'registered', 'registration_form', 'active', 'not_waiting', 'comments'] diff --git a/jdav_web/members/locale/de/LC_MESSAGES/django.po b/jdav_web/members/locale/de/LC_MESSAGES/django.po index 7697ebc..81abb1a 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: 2021-09-24 12:24+0200\n" +"POT-Creation-Date: 2022-01-12 17:38+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: members/admin.py:29 members/models.py:77 +#: members/admin.py:29 members/models.py:78 msgid "Registration complete" msgstr "Anmeldung vollständig" @@ -42,27 +42,27 @@ msgstr "Neue Nachricht an ausgewählte Teilnehmer verfassen" msgid "activity" msgstr "Aktivität" -#: members/admin.py:222 +#: members/admin.py:221 msgid "Difficulty" msgstr "Schwierigkeit" -#: members/admin.py:226 +#: members/admin.py:224 msgid "Tour type" msgstr "Art der Tour" -#: members/admin.py:510 +#: members/admin.py:508 msgid "Convert to PDF" msgstr "Kriseninterventionsliste erstellen" -#: members/admin.py:619 +#: members/admin.py:617 msgid "Generate overview" msgstr "Hinweise für Jugendleiter erstellen" -#: members/admin.py:716 +#: members/admin.py:714 msgid "Generate list for LJP" msgstr "LJP Liste erstellen" -#: members/apps.py:7 members/models.py:166 +#: members/apps.py:7 members/models.py:167 msgid "members" msgstr "Teilnehmer" @@ -74,7 +74,7 @@ msgstr "Name" msgid "Description" msgstr "Beschreibung" -#: members/models.py:31 members/models.py:187 members/models.py:266 +#: members/models.py:31 members/models.py:188 members/models.py:267 #: members/templates/members/change_member.html:17 msgid "Activity" msgstr "Aktivität" @@ -91,7 +91,7 @@ msgstr "Name" msgid "minimum age (years)" msgstr "Mindestalter (Jahre)" -#: members/models.py:49 members/models.py:70 +#: members/models.py:49 members/models.py:71 msgid "group" msgstr "Gruppe" @@ -132,120 +132,124 @@ msgid "Parents' Email" msgstr "Email der Eltern" #: members/models.py:69 +msgid "Also send mails to parents" +msgstr "Emails auch an Eltern schicken" + +#: members/models.py:70 msgid "birth date" msgstr "Geburtsdatum" -#: members/models.py:71 +#: members/models.py:72 msgid "receives newsletter" msgstr "Erhält den Newsletter" -#: members/models.py:75 +#: members/models.py:76 msgid "comments" msgstr "Kommentare" -#: members/models.py:76 +#: members/models.py:77 msgid "created" msgstr "erstellt" -#: members/models.py:78 +#: members/models.py:79 msgid "Active" msgstr "Aktiv" -#: members/models.py:79 +#: members/models.py:80 msgid "Not waiting" msgstr "NICHT Warteliste" -#: members/models.py:80 +#: members/models.py:81 msgid "registration form" msgstr "Anmeldeformular" -#: members/models.py:162 members/models.py:335 +#: members/models.py:163 members/models.py:336 msgid "Group" msgstr "Gruppe" -#: members/models.py:165 +#: members/models.py:166 msgid "member" msgstr "Teilnehmer" -#: members/models.py:189 members/models.py:268 +#: members/models.py:190 members/models.py:269 msgid "Place" msgstr "Ort" -#: members/models.py:190 members/models.py:269 +#: members/models.py:191 members/models.py:270 msgid "Destination (optional)" msgstr "Ziel (optional)" -#: members/models.py:192 members/models.py:271 members/models.py:313 -#: members/models.py:331 +#: members/models.py:193 members/models.py:272 members/models.py:314 +#: members/models.py:332 msgid "Date" msgstr "Datum" -#: members/models.py:193 members/models.py:272 +#: members/models.py:194 members/models.py:273 msgid "End (optional)" msgstr "Ende" -#: members/models.py:195 members/models.py:274 +#: members/models.py:196 members/models.py:275 msgid "Groups" msgstr "Gruppen" -#: members/models.py:203 members/models.py:282 +#: members/models.py:204 members/models.py:283 msgid "Categories" msgstr "Kategorien" -#: members/models.py:204 members/models.py:283 +#: members/models.py:205 members/models.py:284 msgid "easy" msgstr "leicht" -#: members/models.py:204 members/models.py:283 +#: members/models.py:205 members/models.py:284 msgid "medium" msgstr "mittel" -#: members/models.py:204 members/models.py:283 +#: members/models.py:205 members/models.py:284 msgid "hard" msgstr "schwer" -#: members/models.py:213 +#: members/models.py:214 msgid "Memberlist" msgstr "Teilnehmerliste" -#: members/models.py:214 +#: members/models.py:215 msgid "Memberlists" msgstr "Teilnehmerlisten" -#: members/models.py:232 members/models.py:240 members/models.py:248 -#: members/models.py:259 members/models.py:366 members/models.py:373 +#: members/models.py:233 members/models.py:241 members/models.py:249 +#: members/models.py:260 members/models.py:367 members/models.py:374 msgid "Member" msgstr "Teilnehmer" -#: members/models.py:234 members/models.py:253 +#: members/models.py:235 members/models.py:254 msgid "Comment" msgstr "Kommentar" -#: members/models.py:241 members/models.py:260 members/models.py:374 +#: members/models.py:242 members/models.py:261 members/models.py:375 msgid "Members" msgstr "Teilnehmer" -#: members/models.py:312 +#: members/models.py:313 msgid "Title" msgstr "Titel" -#: members/models.py:332 +#: members/models.py:333 msgid "Location" msgstr "Ort" -#: members/models.py:333 +#: members/models.py:334 msgid "Topic" msgstr "Thema" -#: members/models.py:357 +#: members/models.py:358 msgid "Jugendleiter" msgstr "Jugendleiter" -#: members/models.py:360 +#: members/models.py:361 msgid "Klettertreff" msgstr "Klettertreff" -#: members/models.py:361 +#: members/models.py:362 msgid "Klettertreffs" msgstr "Klettertreffs" diff --git a/jdav_web/members/models.py b/jdav_web/members/models.py index fb44441..3a90fa5 100644 --- a/jdav_web/members/models.py +++ b/jdav_web/members/models.py @@ -66,6 +66,7 @@ class Member(models.Model): email = models.EmailField(max_length=100, default="") email_parents = models.EmailField(max_length=100, default="", blank=True, verbose_name=_("Parents' Email")) + cc_email_parents = models.BooleanField(default=True, verbose_name=_('Also send mails to parents')) birth_date = models.DateField(_('birth date')) # to determine the age group = models.ManyToManyField(Group, verbose_name=_('group')) gets_newsletter = models.BooleanField(_('receives newsletter'), diff --git a/jdav_web/startpage/locale/de/LC_MESSAGES/django.po b/jdav_web/startpage/locale/de/LC_MESSAGES/django.po index 9a89878..6a8cc5a 100644 --- a/jdav_web/startpage/locale/de/LC_MESSAGES/django.po +++ b/jdav_web/startpage/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: 2021-09-24 12:24+0200\n" +"POT-Creation-Date: 2022-01-12 17:38+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n"