From 39f22fa31454f482d1c63dea54f726ea4ee928c8 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Mon, 8 Jan 2018 16:05:29 +0100 Subject: [PATCH] Set event name as sender name in emails (thanks @luto for the suggestion) --- src/pretix/base/services/mail.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/pretix/base/services/mail.py b/src/pretix/base/services/mail.py index 018a504960..1425ecb3eb 100644 --- a/src/pretix/base/services/mail.py +++ b/src/pretix/base/services/mail.py @@ -1,4 +1,5 @@ import logging +from email.utils import formataddr from typing import Any, Dict, List, Union import bleach @@ -90,6 +91,10 @@ def mail(email: str, subject: str, template: Union[str, LazyI18nString], body, body_md = render_mail(template, context) 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)) + else: + sender = formataddr((settings.PRETIX_INSTANCE_NAME, sender)) subject = str(subject) body_plain = body