diff --git a/jdav_web/mailer/locale/de/LC_MESSAGES/django.po b/jdav_web/mailer/locale/de/LC_MESSAGES/django.po index 7cba7ab..afa3394 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: 2024-12-01 16:23+0100\n" +"POT-Creation-Date: 2024-12-01 16:56+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -59,100 +59,112 @@ msgstr "Weiterleitung an Teilnehmer*innen" msgid "Forward to group" msgstr "Weiterleitung an Gruppe" -#: mailer/models.py:46 +#: mailer/models.py:32 +msgid "Allowed sender" +msgstr "Erlaubte Absender:innen" + +#: mailer/models.py:33 +msgid "" +"Only forward e-mails of members of selected groups. Leave empty to allow all " +"senders." +msgstr "" +"Leite nur E-Mails von Mitgliedern dieser Gruppen weiter. Lasse dieses Feld " +"frei, um alle Absender*innen zu erlauben." + +#: mailer/models.py:51 msgid "email address" msgstr "Email-Adresse" -#: mailer/models.py:47 +#: mailer/models.py:52 msgid "email addresses" msgstr "Email-Adressen" -#: mailer/models.py:60 +#: mailer/models.py:65 msgid "Either a group or at least one member is required as forward recipient." msgstr "" "Es muss entweder eine Gruppe oder mindestens ein*e Teilnehmer*in als " "Empfänger*in ausgewählt werden." -#: mailer/models.py:68 +#: mailer/models.py:73 msgid "subject" msgstr "Betreff" -#: mailer/models.py:69 +#: mailer/models.py:74 msgid "content" msgstr "Inhalt" -#: mailer/models.py:71 +#: mailer/models.py:76 msgid "to group" msgstr "An Gruppe" -#: mailer/models.py:74 +#: mailer/models.py:79 msgid "to freizeit" msgstr "An Ausfahrt" -#: mailer/models.py:79 +#: mailer/models.py:84 msgid "to notes list" msgstr "An Notizliste" -#: mailer/models.py:84 +#: mailer/models.py:89 msgid "to member" msgstr "An Teilnehmer*innen" -#: mailer/models.py:87 +#: mailer/models.py:92 msgid "reply to participant" msgstr "Antwort an Teilnehmer*innen" -#: mailer/models.py:91 +#: mailer/models.py:96 msgid "reply to custom email address" msgstr "Antwort an Email-Adresse" -#: mailer/models.py:94 +#: mailer/models.py:99 msgid "sent" msgstr "Gesendet" -#: mailer/models.py:95 +#: mailer/models.py:100 msgid "Created by" msgstr "Erstellt von" -#: mailer/models.py:113 +#: mailer/models.py:118 msgid "Some other members" msgstr "Andere Teilnehmer*innen" -#: mailer/models.py:115 +#: mailer/models.py:120 msgid "recipients" msgstr "Empfänger" -#: mailer/models.py:178 +#: mailer/models.py:183 msgid "message" msgstr "Nachricht" -#: mailer/models.py:179 +#: mailer/models.py:184 msgid "messages" msgstr "Nachrichten" -#: mailer/models.py:181 +#: mailer/models.py:186 msgid "Can submit mails" msgstr "Kann Mails verschicken" -#: mailer/models.py:202 +#: mailer/models.py:207 msgid "" "Either a group, a memberlist or at least one member is required as recipient" msgstr "" "Es muss entweder eine Gruppe, eine Teilnehmer*innenliste oder mindestens " "ein*e Teilnehmer*in als Empfänger*in ausgewählt werden." -#: mailer/models.py:209 +#: mailer/models.py:214 msgid "file" msgstr "Datei" -#: mailer/models.py:214 +#: mailer/models.py:219 msgid "Empty" msgstr "Leer" -#: mailer/models.py:217 +#: mailer/models.py:222 msgid "attachment" msgstr "Anhang" -#: mailer/models.py:218 +#: mailer/models.py:223 msgid "attachments" msgstr "Anhänge" diff --git a/jdav_web/mailer/migrations/0006_emailaddress_allowed_senders.py b/jdav_web/mailer/migrations/0006_emailaddress_allowed_senders.py new file mode 100644 index 0000000..dd6de2f --- /dev/null +++ b/jdav_web/mailer/migrations/0006_emailaddress_allowed_senders.py @@ -0,0 +1,19 @@ +# Generated by Django 4.0.1 on 2024-12-01 15:54 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('members', '0029_alter_member_gender_alter_memberwaitinglist_gender'), + ('mailer', '0005_alter_emailaddress_name'), + ] + + operations = [ + migrations.AddField( + model_name='emailaddress', + name='allowed_senders', + field=models.ManyToManyField(blank=True, help_text='Only forward e-mails of members of selected groups. Leave empty to allow all senders.', related_name='allowed_sender_on_emailaddresses', to='members.Group', verbose_name='Allowed sender'), + ), + ] diff --git a/jdav_web/mailer/models.py b/jdav_web/mailer/models.py index 0e90440..96551e3 100644 --- a/jdav_web/mailer/models.py +++ b/jdav_web/mailer/models.py @@ -28,6 +28,11 @@ class EmailAddress(models.Model): to_groups = models.ManyToManyField('members.Group', verbose_name=_('Forward to group'), blank=True) + allowed_senders = models.ManyToManyField('members.Group', + verbose_name=_('Allowed sender'), + help_text=_('Only forward e-mails of members of selected groups. Leave empty to allow all senders.'), + blank=True, + related_name='allowed_sender_on_emailaddresses') @property def email(self):