Add Mail sender name option

This commit is contained in:
Martin Gross
2019-05-22 16:09:52 +02:00
parent 6acca4c4ba
commit 6238e1df98
4 changed files with 13 additions and 1 deletions

View File

@@ -100,7 +100,8 @@ def mail(email: str, subject: str, template: Union[str, LazyI18nString],
subject = str(subject).format_map(context)
sender = sender or (event.settings.get('mail_from') if event else settings.MAIL_FROM)
if event:
sender = formataddr((str(event.name), sender))
sender_name = event.settings.mail_from_name or str(event.name)
sender = formataddr((sender_name, sender))
else:
sender = formataddr((settings.PRETIX_INSTANCE_NAME, sender))

View File

@@ -301,6 +301,10 @@ DEFAULTS = {
'default': settings.MAIL_FROM,
'type': str
},
'mail_from_name': {
'default': None,
'type': str
},
'mail_text_signature': {
'type': LazyI18nString,
'default': ""

View File

@@ -810,6 +810,12 @@ class MailSettingsForm(SettingsForm):
label=_("Sender address"),
help_text=_("Sender address for outgoing emails"),
)
mail_from_name = forms.CharField(
label=_("Sender name"),
help_text=_("Sender name used in conjunction with the sender address for outgoing emails. "
"Defaults to your event name."),
required=False
)
mail_bcc = forms.CharField(
label=_("Bcc address"),
help_text=_("All emails will be sent to this address as a Bcc copy"),

View File

@@ -12,6 +12,7 @@
<legend>{% trans "General settings" %}</legend>
{% bootstrap_field form.mail_prefix layout="control" %}
{% bootstrap_field form.mail_from layout="control" %}
{% bootstrap_field form.mail_from_name layout="control" %}
{% bootstrap_field form.mail_text_signature layout="control" %}
{% bootstrap_field form.mail_bcc layout="control" %}
</fieldset>