From 879384f357b833a1819abb1c8f74300fa1cd42a1 Mon Sep 17 00:00:00 2001
From: Raphael Michel <mail@raphaelmichel.de>
Date: Tue, 16 Jun 2015 20:09:10 +0200
Subject: [PATCH] Added a setting for an e-mail subject prefix

---
 src/pretix/base/services/mail.py                           | 7 ++++++-
 src/pretix/base/settings.py                                | 4 ++++
 src/pretix/control/forms/event.py                          | 5 +++++
 .../control/templates/pretixcontrol/event/settings.html    | 1 +
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/pretix/base/services/mail.py b/src/pretix/base/services/mail.py
index 57d99c3cfc..35097e692f 100644
--- a/src/pretix/base/services/mail.py
+++ b/src/pretix/base/services/mail.py
@@ -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
 
+    subject = str(subject)
+    prefix = event.settings.get('mail_prefix')
+    if prefix:
+        subject = "[%s] %s" % (prefix, subject)
+
     email = EmailMessage(
-        str(subject), body, sender,
+        subject, body, sender,
         to=[user.email]
     )
 
diff --git a/src/pretix/base/settings.py b/src/pretix/base/settings.py
index 3fc3b6a050..7540b5a11e 100644
--- a/src/pretix/base/settings.py
+++ b/src/pretix/base/settings.py
@@ -89,6 +89,10 @@ DEFAULTS = {
         'default': None,
         'type': str
     },
+    'mail_prefix': {
+        'default': None,
+        'type': str
+    },
     'mail_from': {
         'default': settings.MAIL_FROM,
         'type': str
diff --git a/src/pretix/control/forms/event.py b/src/pretix/control/forms/event.py
index bcc4282505..e7a581d43a 100644
--- a/src/pretix/control/forms/event.py
+++ b/src/pretix/control/forms/event.py
@@ -151,6 +151,11 @@ class EventSettingsForm(SettingsForm):
         required=False,
         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(
         label=_("Sender address"),
         help_text=_("Sender address for outgoing e-mails")
diff --git a/src/pretix/control/templates/pretixcontrol/event/settings.html b/src/pretix/control/templates/pretixcontrol/event/settings.html
index f79a7427b5..f8e8bc8479 100644
--- a/src/pretix/control/templates/pretixcontrol/event/settings.html
+++ b/src/pretix/control/templates/pretixcontrol/event/settings.html
@@ -43,6 +43,7 @@
         </fieldset>
         <fieldset>
             <legend>{% trans "E-Mail settings" %}</legend>
+            {% bootstrap_field sform.mail_prefix layout="horizontal" %}
             {% bootstrap_field sform.mail_from layout="horizontal" %}
         </fieldset>
         <div class="form-group submit-group">