Made email subject prefix configurable.

dav_events/emails.py

@@ -32,11 +32,15 @@ def get_recipients(task, sport=None):
 
 class AbstractMail(object):
     _sender = app_config.settings.email_sender
-    _subject = 'Generic Mail'
+    _subject = u''
     _template_name = None
 
     def _get_subject(self, **kwargs):
-        return self._subject.format(**kwargs)
+        s = self._subject
+        if app_config.settings.email_subject_prefix:
+            s = u'%s %s' % (app_config.settings.email_subject_prefix, s)
+        s.format(**kwargs)
+        return s
 
     def _get_template(self):
         if not self._template_name:
@@ -73,7 +77,6 @@ class AbstractMail(object):
 
 
 class AbstractEventMail(AbstractMail):
-    _subject = u'[DAV Veranstaltungen]'
     _template_name = 'dav_events/emails/default.txt'
 
     def __init__(self, recipient, event):
@@ -97,7 +100,7 @@ class NewEventMail(AbstractEventMail):
 
     def _get_subject(self, **kwargs):
         s = super(NewEventMail, self)._get_subject(**kwargs)
-        s += u' Neue Veranstaltung angelegt'
+        s += u'Neue Veranstaltung angelegt'
         return s
 
 
@@ -115,7 +118,7 @@ class EventToAcceptMail(AbstractEventMail):
 
     def _get_subject(self, **kwargs):
         s = super(EventToAcceptMail, self)._get_subject(**kwargs)
-        s += u' Neue Veranstaltung freigeben'
+        s += u'Neue Veranstaltung freigeben'
         return s
 
 
@@ -124,7 +127,7 @@ class EventAcceptedMail(AbstractEventMail):
 
     def _get_subject(self, **kwargs):
         s = super(EventAcceptedMail, self)._get_subject(**kwargs)
-        s += u' Veranstaltung wurde freigegeben'
+        s += u'Veranstaltung wurde freigegeben'
         return s
 
 
@@ -133,12 +136,12 @@ class EventToPublishMail(AbstractEventMail):
 
     def _get_subject(self, **kwargs):
         s = super(EventToPublishMail, self)._get_subject(**kwargs)
-        s += u' Veranstaltung veröffentlichen'
+        s += u'Veranstaltung veröffentlichen'
         return s
 
 
 class PasswordSetEmail(AbstractMail):
-    _subject = u'[DAV Veranstaltungen] Zugangsdaten'
+    _subject = u'Zugangsdaten'
     _template_name = 'dav_events/emails/password_set.txt'
 
     def __init__(self, user, password):