Added a setting for an e-mail subject prefix

This commit is contained in:
Raphael Michel
2015-06-16 20:09:10 +02:00
parent 35f5263430
commit 879384f357
4 changed files with 16 additions and 1 deletions

View File

@@ -36,8 +36,13 @@ def mail(user: User, subject: str, template: str, context: dict, event: Event=No
sender = event.settings.get('mail_from') if event else settings.MAIL_FROM sender = event.settings.get('mail_from') if event else settings.MAIL_FROM
subject = str(subject)
prefix = event.settings.get('mail_prefix')
if prefix:
subject = "[%s] %s" % (prefix, subject)
email = EmailMessage( email = EmailMessage(
str(subject), body, sender, subject, body, sender,
to=[user.email] to=[user.email]
) )

View File

@@ -89,6 +89,10 @@ DEFAULTS = {
'default': None, 'default': None,
'type': str 'type': str
}, },
'mail_prefix': {
'default': None,
'type': str
},
'mail_from': { 'mail_from': {
'default': settings.MAIL_FROM, 'default': settings.MAIL_FROM,
'type': str 'type': str

View File

@@ -151,6 +151,11 @@ class EventSettingsForm(SettingsForm):
required=False, required=False,
help_text=_("Public email address for contacting the organizer") help_text=_("Public email address for contacting the organizer")
) )
mail_prefix = forms.CharField(
label=_("Subject prefix"),
help_text=_("This will be prepended to the subject of all outgoing emails. This could be a short form of "
"your event name.")
)
mail_from = forms.EmailField( mail_from = forms.EmailField(
label=_("Sender address"), label=_("Sender address"),
help_text=_("Sender address for outgoing e-mails") help_text=_("Sender address for outgoing e-mails")

View File

@@ -43,6 +43,7 @@
</fieldset> </fieldset>
<fieldset> <fieldset>
<legend>{% trans "E-Mail settings" %}</legend> <legend>{% trans "E-Mail settings" %}</legend>
{% bootstrap_field sform.mail_prefix layout="horizontal" %}
{% bootstrap_field sform.mail_from layout="horizontal" %} {% bootstrap_field sform.mail_from layout="horizontal" %}
</fieldset> </fieldset>
<div class="form-group submit-group"> <div class="form-group submit-group">