digitales
/
kompass
4
1
Fork 1
Code Issues 45 Pull Requests 2 Packages Projects Releases Wiki Activity

add check to control whether mails are also sent to parents

Browse Source
v1-0-stable
Christian Merten 4 years ago
parent 5442fc2b04
commit 4386ae268a
8 changed files with 67 additions and 62 deletions
Show Stats Download Patch File Download Diff File

2
jdav_web/locale/de/LC_MESSAGES/django.po
Unescape Escape View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"

34
jdav_web/mailer/locale/de/LC_MESSAGES/django.po
Unescape Escape View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -84,54 +84,54 @@ msgstr "An Gruppe"
msgid "to freizeit" msgid "to freizeit"
msgstr "An Freizeit" msgstr "An Freizeit"
#: mailer/models.py:77 #: mailer/models.py:78
msgid "to notes list" msgid "to notes list"
msgstr "An Notizliste" msgstr "An Notizliste"
#: mailer/models.py:81 #: mailer/models.py:83
msgid "to member" msgid "to member"
msgstr "An Teilnehmer" msgstr "An Teilnehmer"
#: mailer/models.py:84 #: mailer/models.py:86
msgid "reply to participant" msgid "reply to participant"
msgstr "Antwort an Teilnehmer" msgstr "Antwort an Teilnehmer"
#: mailer/models.py:88 #: mailer/models.py:90
msgid "reply to custom email address" msgid "reply to custom email address"
msgstr "Antwort an Email-Adresse" msgstr "Antwort an Email-Adresse"
#: mailer/models.py:91 #: mailer/models.py:93
msgid "sent" msgid "sent"
msgstr "Gesendet" msgstr "Gesendet"
#: mailer/models.py:105 #: mailer/models.py:107
msgid "Some other members" msgid "Some other members"
msgstr "Andere Teilnehmer" msgstr "Andere Teilnehmer"
#: mailer/models.py:107 #: mailer/models.py:109
msgid "recipients" msgid "recipients"
msgstr "Empfänger" msgstr "Empfänger"
#: mailer/models.py:166 #: mailer/models.py:168
msgid "message" msgid "message"
msgstr "Nachricht" msgstr "Nachricht"
#: mailer/models.py:167 #: mailer/models.py:169
msgid "messages" msgid "messages"
msgstr "Nachrichten" msgstr "Nachrichten"
#: mailer/models.py:169 #: mailer/models.py:171
msgid "Can submit mails" msgid "Can submit mails"
msgstr "Kann Mails verschicken" msgstr "Kann Mails verschicken"
#: mailer/models.py:185 #: mailer/models.py:187
msgid "" msgid ""
"Either a group, a memberlist or at least one member is required as recipient" "Either a group, a memberlist or at least one member is required as recipient"
msgstr "" msgstr ""
"Es muss entweder eine Gruppe, eine Teilnehmerliste oder mindestens ein " "Es muss entweder eine Gruppe, eine Teilnehmerliste oder mindestens ein "
"Teilnehmer als Empfänger ausgewählt werden." "Teilnehmer als Empfänger ausgewählt werden."
#: mailer/models.py:190 #: mailer/models.py:192
msgid "" msgid ""
"At least one reply-to recipient is required. Use the info mail if you really " "At least one reply-to recipient is required. Use the info mail if you really "
"want no reply-to recipient." "want no reply-to recipient."
@ -139,19 +139,19 @@ msgstr ""
"Es muss mindestens ein Antwort-An Empfänger angegeben werden. Nutze die info " "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." "Email-Adresse falls du wirklich keinen Antwort-An Empfänger haben möchtest."
#: mailer/models.py:197 #: mailer/models.py:199
msgid "file" msgid "file"
msgstr "Datei" msgstr "Datei"
#: mailer/models.py:203 #: mailer/models.py:205
msgid "Empty" msgid "Empty"
msgstr "Leer" msgstr "Leer"
#: mailer/models.py:206 #: mailer/models.py:208
msgid "attachment" msgid "attachment"
msgstr "Anhang" msgstr "Anhang"
#: mailer/models.py:207 #: mailer/models.py:209
msgid "attachments" msgid "attachments"
msgstr "Anhänge" msgstr "Anhänge"

2
jdav_web/mailer/models.py
Unescape Escape View File

@ -132,7 +132,7 @@ class Message(models.Model):
if a.f.name] if a.f.name]
emails = [member.email for member in filtered] emails = [member.email for member in filtered]
emails.extend([member.email_parents 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 # remove any underscores from subject to prevent Arne from using
# terrible looking underscores in subjects # terrible looking underscores in subjects
self.subject = self.subject.replace('_', ' ') self.subject = self.subject.replace('_', ' ')

2
jdav_web/material/locale/de/LC_MESSAGES/django.po
Unescape Escape View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"

2
jdav_web/members/admin.py
Unescape Escape View File

@ -66,7 +66,7 @@ class RegistrationFilter(admin.SimpleListFilter):
# Register your models here. # Register your models here.
class MemberAdmin(admin.ModelAdmin): 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', 'town', 'phone_number', 'phone_number_parents', 'birth_date', 'group',
'gets_newsletter', 'registered', 'registration_form', 'active', 'gets_newsletter', 'registered', 'registration_form', 'active',
'not_waiting', 'comments'] 'not_waiting', 'comments']

84
jdav_web/members/locale/de/LC_MESSAGES/django.po
Unescape Escape View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -18,7 +18,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\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" msgid "Registration complete"
msgstr "Anmeldung vollständig" msgstr "Anmeldung vollständig"
@ -42,27 +42,27 @@ msgstr "Neue Nachricht an ausgewählte Teilnehmer verfassen"
msgid "activity" msgid "activity"
msgstr "Aktivität" msgstr "Aktivität"
#: members/admin.py:222 #: members/admin.py:221
msgid "Difficulty" msgid "Difficulty"
msgstr "Schwierigkeit" msgstr "Schwierigkeit"
#: members/admin.py:226 #: members/admin.py:224
msgid "Tour type" msgid "Tour type"
msgstr "Art der Tour" msgstr "Art der Tour"
#: members/admin.py:510 #: members/admin.py:508
msgid "Convert to PDF" msgid "Convert to PDF"
msgstr "Kriseninterventionsliste erstellen" msgstr "Kriseninterventionsliste erstellen"
#: members/admin.py:619 #: members/admin.py:617
msgid "Generate overview" msgid "Generate overview"
msgstr "Hinweise für Jugendleiter erstellen" msgstr "Hinweise für Jugendleiter erstellen"
#: members/admin.py:716 #: members/admin.py:714
msgid "Generate list for LJP" msgid "Generate list for LJP"
msgstr "LJP Liste erstellen" msgstr "LJP Liste erstellen"
#: members/apps.py:7 members/models.py:166 #: members/apps.py:7 members/models.py:167
msgid "members" msgid "members"
msgstr "Teilnehmer" msgstr "Teilnehmer"
@ -74,7 +74,7 @@ msgstr "Name"
msgid "Description" msgid "Description"
msgstr "Beschreibung" 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 #: members/templates/members/change_member.html:17
msgid "Activity" msgid "Activity"
msgstr "Aktivität" msgstr "Aktivität"
@ -91,7 +91,7 @@ msgstr "Name"
msgid "minimum age (years)" msgid "minimum age (years)"
msgstr "Mindestalter (Jahre)" msgstr "Mindestalter (Jahre)"
#: members/models.py:49 members/models.py:70 #: members/models.py:49 members/models.py:71
msgid "group" msgid "group"
msgstr "Gruppe" msgstr "Gruppe"
@ -132,120 +132,124 @@ msgid "Parents' Email"
msgstr "Email der Eltern" msgstr "Email der Eltern"
#: members/models.py:69 #: members/models.py:69
msgid "Also send mails to parents"
msgstr "Emails auch an Eltern schicken"
#: members/models.py:70
msgid "birth date" msgid "birth date"
msgstr "Geburtsdatum" msgstr "Geburtsdatum"
#: members/models.py:71 #: members/models.py:72
msgid "receives newsletter" msgid "receives newsletter"
msgstr "Erhält den Newsletter" msgstr "Erhält den Newsletter"
#: members/models.py:75 #: members/models.py:76
msgid "comments" msgid "comments"
msgstr "Kommentare" msgstr "Kommentare"
#: members/models.py:76 #: members/models.py:77
msgid "created" msgid "created"
msgstr "erstellt" msgstr "erstellt"
#: members/models.py:78 #: members/models.py:79
msgid "Active" msgid "Active"
msgstr "Aktiv" msgstr "Aktiv"
#: members/models.py:79 #: members/models.py:80
msgid "Not waiting" msgid "Not waiting"
msgstr "NICHT Warteliste" msgstr "NICHT Warteliste"
#: members/models.py:80 #: members/models.py:81
msgid "registration form" msgid "registration form"
msgstr "Anmeldeformular" msgstr "Anmeldeformular"
#: members/models.py:162 members/models.py:335 #: members/models.py:163 members/models.py:336
msgid "Group" msgid "Group"
msgstr "Gruppe" msgstr "Gruppe"
#: members/models.py:165 #: members/models.py:166
msgid "member" msgid "member"
msgstr "Teilnehmer" msgstr "Teilnehmer"
#: members/models.py:189 members/models.py:268 #: members/models.py:190 members/models.py:269
msgid "Place" msgid "Place"
msgstr "Ort" msgstr "Ort"
#: members/models.py:190 members/models.py:269 #: members/models.py:191 members/models.py:270
msgid "Destination (optional)" msgid "Destination (optional)"
msgstr "Ziel (optional)" msgstr "Ziel (optional)"
#: members/models.py:192 members/models.py:271 members/models.py:313 #: members/models.py:193 members/models.py:272 members/models.py:314
#: members/models.py:331 #: members/models.py:332
msgid "Date" msgid "Date"
msgstr "Datum" msgstr "Datum"
#: members/models.py:193 members/models.py:272 #: members/models.py:194 members/models.py:273
msgid "End (optional)" msgid "End (optional)"
msgstr "Ende" msgstr "Ende"
#: members/models.py:195 members/models.py:274 #: members/models.py:196 members/models.py:275
msgid "Groups" msgid "Groups"
msgstr "Gruppen" msgstr "Gruppen"
#: members/models.py:203 members/models.py:282 #: members/models.py:204 members/models.py:283
msgid "Categories" msgid "Categories"
msgstr "Kategorien" msgstr "Kategorien"
#: members/models.py:204 members/models.py:283 #: members/models.py:205 members/models.py:284
msgid "easy" msgid "easy"
msgstr "leicht" msgstr "leicht"
#: members/models.py:204 members/models.py:283 #: members/models.py:205 members/models.py:284
msgid "medium" msgid "medium"
msgstr "mittel" msgstr "mittel"
#: members/models.py:204 members/models.py:283 #: members/models.py:205 members/models.py:284
msgid "hard" msgid "hard"
msgstr "schwer" msgstr "schwer"
#: members/models.py:213 #: members/models.py:214
msgid "Memberlist" msgid "Memberlist"
msgstr "Teilnehmerliste" msgstr "Teilnehmerliste"
#: members/models.py:214 #: members/models.py:215
msgid "Memberlists" msgid "Memberlists"
msgstr "Teilnehmerlisten" msgstr "Teilnehmerlisten"
#: members/models.py:232 members/models.py:240 members/models.py:248 #: members/models.py:233 members/models.py:241 members/models.py:249
#: members/models.py:259 members/models.py:366 members/models.py:373 #: members/models.py:260 members/models.py:367 members/models.py:374
msgid "Member" msgid "Member"
msgstr "Teilnehmer" msgstr "Teilnehmer"
#: members/models.py:234 members/models.py:253 #: members/models.py:235 members/models.py:254
msgid "Comment" msgid "Comment"
msgstr "Kommentar" 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" msgid "Members"
msgstr "Teilnehmer" msgstr "Teilnehmer"
#: members/models.py:312 #: members/models.py:313
msgid "Title" msgid "Title"
msgstr "Titel" msgstr "Titel"
#: members/models.py:332 #: members/models.py:333
msgid "Location" msgid "Location"
msgstr "Ort" msgstr "Ort"
#: members/models.py:333 #: members/models.py:334
msgid "Topic" msgid "Topic"
msgstr "Thema" msgstr "Thema"
#: members/models.py:357 #: members/models.py:358
msgid "Jugendleiter" msgid "Jugendleiter"
msgstr "Jugendleiter" msgstr "Jugendleiter"
#: members/models.py:360 #: members/models.py:361
msgid "Klettertreff" msgid "Klettertreff"
msgstr "Klettertreff" msgstr "Klettertreff"
#: members/models.py:361 #: members/models.py:362
msgid "Klettertreffs" msgid "Klettertreffs"
msgstr "Klettertreffs" msgstr "Klettertreffs"

1
jdav_web/members/models.py
Unescape Escape View File

@ -66,6 +66,7 @@ class Member(models.Model):
email = models.EmailField(max_length=100, default="") email = models.EmailField(max_length=100, default="")
email_parents = models.EmailField(max_length=100, default="", blank=True, email_parents = models.EmailField(max_length=100, default="", blank=True,
verbose_name=_("Parents' Email")) 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 birth_date = models.DateField(_('birth date')) # to determine the age
group = models.ManyToManyField(Group, verbose_name=_('group')) group = models.ManyToManyField(Group, verbose_name=_('group'))
gets_newsletter = models.BooleanField(_('receives newsletter'), gets_newsletter = models.BooleanField(_('receives newsletter'),

2
jdav_web/startpage/locale/de/LC_MESSAGES/django.po
Unescape Escape View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"

Write Preview
Loading…
Cancel
Save