UPD: dav_registration: merged suggestions from test users about emails.

dav_registration/emails.py

@@ -34,9 +34,13 @@ class AbstractRegistrationMail(AbstractMail):
 
 
 class InformTrainerRegistrationMail(AbstractRegistrationMail):
-    _subject = u'Anmeldung'
+    _subject = u'Anmeldung {full_name}'
     _template_name = 'dav_registration/emails/inform_trainer.txt'
 
+    def _get_subject(self, subject_fmt=None, **kwargs):
+        kwargs['full_name'] = self._registration.get_full_name()
+        return super(InformTrainerRegistrationMail, self)._get_subject(subject_fmt=subject_fmt, **kwargs)
+
     def _get_reply_to(self):
         s = u'"{fullname}" <{email}>'.format(fullname=self._registration.get_full_name(),
                                              email=self._registration.email_address)

dav_registration/templates/dav_registration/emails/inform_self.txt

@@ -11,7 +11,7 @@ Veranstaltung: {{ event.number }} - {{ event.title }}
 Datum: {{ event.get_formated_date }}
 Tourenleitung: {{ event.get_trainer_full_name }}
 Anmeldezeitpunkt: {{ registration.created_at|date:'l, d. F Y, G:i' }}
-Anmeldenummer: {{ registration.id }}
+Referenz-Nr: {{ registration.id }}
 
 Personendaten
 -------------

dav_registration/templates/dav_registration/emails/inform_trainer.txt

@@ -1,41 +1,28 @@
 Hallo {{ recipient.first_name }},
 
-Anmeldung zu deiner Veranstaltung {{ event.number }}
-{{ event.title }}
+Anmeldung zu deiner Veranstaltung
+{{ event.number }} - {{ event.title }}
 ========================================================================
 Anmeldezeitpunkt: {{ registration.created_at|date:'l, d. F Y, G:i' }}
-Anmeldenummer: {{ registration.id }}
+Referenz-Nr: {{ registration.id }}
 
-Teilnehmer*in
--------------
+Teilnehmer*in:
 {{ registration.get_full_name }}
-
-Telefonnummer und E-Mail-Adresse
---------------------------------
+{{ registration.address }},{{ registration.postal_code }} {{ registration.city }}
 {{ registration.phone_number }}
 {{ registration.email_address }}
+{{ registration.dav_number }}
 
-Erfahrung
----------
-{% if registration.experience %}{{ registration.experience }}{% else %}-{% endif %}
-
-Anmerkung
----------
-{% if registration.note %}{{ registration.note }}{% else %}-{% endif %}
-
-Personendaten
--------------
-{{ registration.get_full_name }}
-{{ registration.address }}
-{{ registration.postal_code }} {{ registration.city }}
-Telefon: {{ registration.phone_number }}
-E-Mail: {{ registration.email_address }}
-DAV Mitgliedsnummer: {{ registration.dav_number }}
-
-Notfall-Kontakt
----------------
+Notfall-Kontakt:
 {% if registration.emergency_contact %}{{ registration.emergency_contact }}{% else %}-{% endif %}
 
+Erfahrung:
+{% if registration.experience %}{{ registration.experience }}{% else %}-{% endif %}
+
+Anmerkung:
+{% if registration.note %}{{ registration.note }}{% else %}-{% endif %}
+
+------------------------------
 Erklärung zur Datenspeicherung
 ------------------------------
 {% if registration.privacy_policy %}{{ registration.privacy_policy }}{% else %}-{% endif %}