From 79c20087e311666a56de143a8d7a80af18f157a4 Mon Sep 17 00:00:00 2001 From: Christian Merten Date: Sat, 1 Feb 2025 22:12:34 +0100 Subject: [PATCH] mailer: use internal mail domains variable in error messages --- jdav_web/mailer/admin.py | 4 +++- .../mailer/locale/de/LC_MESSAGES/django.po | 18 +++++++++++------- jdav_web/mailer/models.py | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/jdav_web/mailer/admin.py b/jdav_web/mailer/admin.py index a889d06..15848f2 100644 --- a/jdav_web/mailer/admin.py +++ b/jdav_web/mailer/admin.py @@ -1,4 +1,5 @@ from django.contrib import admin, messages +from django.conf import settings from django.contrib.admin import helpers from django.utils.translation import gettext_lazy as _ from django.shortcuts import render @@ -97,7 +98,8 @@ def submit_message(msg, request): return sender = request.user.member if not sender.has_internal_email(): - messages.error(request, _("Your email address is not an internal email address. Please change your email address and try again.")) + messages.error(request, + _("Your email address is not an internal email address. Please use an email address with one of the following domains: %(domains)s.") % {'domains': ", ".join(settings.ALLOWED_EMAIL_DOMAINS_FOR_INVITE_AS_USER)}) return success = msg.submit(sender) if success == NOT_SENT: diff --git a/jdav_web/mailer/locale/de/LC_MESSAGES/django.po b/jdav_web/mailer/locale/de/LC_MESSAGES/django.po index b97b0df..b5eea2c 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: 2025-01-01 21:48+0100\n" +"POT-Creation-Date: 2025-02-01 21:35+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -31,12 +31,13 @@ msgstr "" "deine*n Systemadministrator*in." #: mailer/admin.py +#, python-format msgid "" -"Your email address is not an internal email address. Please change your " -"email address and try again." +"Your email address is not an internal email address. Please use an email " +"address with one of the following domains: %(domains)s." msgstr "" "Deine E-Mail Adresse ist keine DAV360 E-Mail Adresse. Bitte stelle sicher, " -"dass deine E-Mail Adresse mit @alpenverein-heidelberg.de endet." +"dass deine E-Mail Adresse eine der folgenden Domains hat: %(domains)s." #: mailer/admin.py msgid "Failed to send message" @@ -80,10 +81,13 @@ msgid "Restrict to internal email addresses" msgstr "Weiterleitung nur von internen E-Mail Adressen erlaubt" #: mailer/models.py -msgid "Only allow forwarding to this e-mail address from the internal domain." +#, python-format +msgid "" +"Only allow forwarding to this e-mail address from one of the following " +"domains: %(domains)s." msgstr "" -"Leite nur E-Mails weiter, die von ...@alpenverein-heidelberg.de verschickt " -"wurden. " +"Leite nur E-Mails weiter, die von einer der folgenden Domains verschickt " +"wurden: %(domains)s." #: mailer/models.py msgid "Allowed sender" diff --git a/jdav_web/mailer/models.py b/jdav_web/mailer/models.py index 685be2f..69fe62d 100644 --- a/jdav_web/mailer/models.py +++ b/jdav_web/mailer/models.py @@ -31,7 +31,7 @@ class EmailAddress(models.Model): verbose_name=_('Forward to group'), blank=True) internal_only = models.BooleanField(verbose_name=_('Restrict to internal email addresses'), - help_text=_('Only allow forwarding to this e-mail address from the internal domain.'), + help_text=_('Only allow forwarding to this e-mail address from one of the following domains: %(domains)s.') % {'domains': ", ".join(settings.ALLOWED_EMAIL_DOMAINS_FOR_INVITE_AS_USER)}, default=False) allowed_senders = models.ManyToManyField('members.Group', verbose_name=_('Allowed sender'),