X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=templates%2Finfluences%2Femail%2Finfluence_changed.html;h=f4c8af8671b797169bbad5bb08055d269fc0ec59;hb=0bb81ee5973a3fb3096c5e8ccbb3dd49dae0934c;hp=6aaa4321aa6362e2492f5cd9025b5148da2ac49e;hpb=ecd3ab2dabc5319f82a221e822e980161a3647ff;p=matthijs%2Fprojects%2Fxerxes.git

diff --git a/templates/influences/email/influence_changed.html b/templates/influences/email/influence_changed.html
index 6aaa432..f4c8af8 100644
--- a/templates/influences/email/influence_changed.html
+++ b/templates/influences/email/influence_changed.html
@@ -1,22 +1,23 @@
-{% load i18n %}{% load gapless %}{% autoescape off %}{% gapless %}
-From: Inschrijfsysteem <inschrijf@evolution-events.nl>
+{% load gapless %}{% gapless %}
+{% load i18n %}
+{% autoescape off %}
+From: Xerxes (Evolution Events)<xerxes@evolution-events.nl>
+X-Mailer: Xerxes
 {% if created %}
 Subject: {% blocktrans %}Influence "{{ influence }}" submitted.{% endblocktrans %}
 {% else %}
 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%}:
@@ -27,11 +28,18 @@ You have submitted an influence on {{ creation_date }}.
 {% filter ljust:20%}{% trans "Contact" %}:{%endfilter%}{{ influence.contact }}
 {% filter ljust:20%}{% trans "Summary" %}:{%endfilter%}{{ influence.summary }}
 {% filter ljust:20%}{% trans "Status" %}:{%endfilter%}{{ influence.get_status_display }}
+{% if influence.longterm %}
 {% filter ljust:20%}{% trans "Long term" %}:{%endfilter%}{{ influence.longterm|yesno|capfirst }}
+{% endif %}
 {% trans "Description" %}:
-{% filter wordwrap:72 %}{{ influence.description }}{% endfilter %}
+{% filter wordwrap:72 %}
+{{ influence.description }}
+{% endfilter %}
 {% if influence.result %}
 {% trans "Result" %}:
-{% filter wordwrap:72 %}{{ influence.result }}{% endfilter %}
+{% filter wordwrap:72 %}
+{{ influence.result }}
+{% endfilter %}
 {% endif %}
-{% endgapless %}{% endautoescape %}
+{% endautoescape %}
+{% endgapless %}