Merge branch 'production'

[matthijs/projects/xerxes.git] / templates / influences / email / influence_changed.html

diff --git a/templates/influences/email/influence_changed.html b/templates/influences/email/influence_changed.html
index 197aef508cb41e148c8c001e5a806d9d01b94083..982bf1ed0cac6f9d04293658ea5c2ffd7a67d91e 100644 (file)
--- a/templates/influences/email/influence_changed.html
+++ b/templates/influences/email/influence_changed.html
@@ -1,5 +1,6 @@
 {% load gapless %}{% gapless %}
 {% load i18n %}
+{% load list %}
 {% autoescape off %}
 From: Xerxes (Evolution Events)<xerxes@evolution-events.nl>
 X-Mailer: Xerxes
@@ -9,23 +10,25 @@ Subject: {% blocktrans %}Influence "{{ influence }}" submitted.{% endblocktrans
 Subject: {% blocktrans %}Influence "{{ influence }}" was changed.{% endblocktrans %}
 {% endif%}
 \\
-{% if recipients.0.first_name %}
-{% blocktrans with recipients.0.first_name as name %}Hello {{ name }}{% endblocktrans %},
+{% if first_name %}
+{% blocktrans %}Hello {{ first_name }}{% endblocktrans %},
 {% else %}
 {% trans "L.S." %},
 {% endif %}
 \\
 {% filter wordwrap:72 %}
 {% blocktrans with influence.created|date:"j F Y" as creation_date %}
-You have submitted an influence on {{ creation_date }}.
+You are involved in this influence, submitted on {{ creation_date }}.
 {% endblocktrans %}
 {% if not created %}
 {% blocktrans %}The influence has been modified. The current status is{%endblocktrans %}:{% else %}{% blocktrans %}You submitted{% endblocktrans%}:
 {% endif %}
 {% endfilter %}
 \\
-{% filter ljust:20%}{% trans "Character" %}:{%endfilter%}{{ influence.character }}
-{% filter ljust:20%}{% trans "Contact" %}:{%endfilter%}{{ influence.contact }}
+{% filter ljust:20%}{% trans "Iniator" %}:{%endfilter%}{{ influence.initiator }}
+{% if influence.involved %}
+{% filter ljust:20%}{% trans "Involved" %}:{%endfilter%}{{ influence.involved|natural_list }}
+{% endif %}
 {% filter ljust:20%}{% trans "Summary" %}:{%endfilter%}{{ influence.summary }}
 {% filter ljust:20%}{% trans "Status" %}:{%endfilter%}{{ influence.get_status_display }}
 {% if influence.longterm %}