From: Matthijs Kooijman <matthijs@stdio.flexvps.nl>
Date: Fri, 8 Feb 2008 23:45:41 +0000 (+0100)
Subject:  * Put some useful content in the character_changed template.
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=371c0f788a1c64d3071f2ce6a924ae6f3fce3d97;p=matthijs%2Fprojects%2Fxerxes.git

 * Put some useful content in the character_changed template.
 * Some cosmetic fixes in the influence_changed template.
---

diff --git a/templates/influences/email/character_changed.html b/templates/influences/email/character_changed.html
index 542250b..c9c0f49 100644
--- a/templates/influences/email/character_changed.html
+++ b/templates/influences/email/character_changed.html
@@ -1,4 +1,30 @@
+{% load gapless %}{% gapless %}
+{% load i18n %}
+{% autoescape off %}
 From: Inschrijfsysteem <inschrijf@evolution-events.nl>
-Subject: Character {{ character }} was changed.
-
-Pomtieflomptie
+{% if created %}
+Subject: {% blocktrans %}Character "{{ character }}" created.{% endblocktrans %}
+{% else %}
+Subject: {% blocktrans %}Character "{{ character }}" was changed.{% endblocktrans %}
+{% endif%}
+\\
+{% if recipients.0.first_name %}
+{% blocktrans with recipients.0.first_name as name %}Hello {{ name }}{% endblocktrans %},
+{% else %}
+{% trans "L.S." %},
+{% endif %}
+\\
+{% filter wordwrap:72 %}
+{% blocktrans with character.created|date:"j F Y" as creation_date %}
+You have created a character on {{ creation_date }}.
+{% endblocktrans %}
+{% if not created %}
+{% blocktrans %}The character has been modified. The current status is{%endblocktrans %}:
+{% else %}
+{% blocktrans %}You submitted{% endblocktrans%}:
+{% endif %}
+{% endfilter %}
+\\
+{% filter ljust:20%}{% trans "Character name" %}:{%endfilter%}{{ character.name }}
+{% endautoescape %}
+{% endgapless %}
diff --git a/templates/influences/email/influence_changed.html b/templates/influences/email/influence_changed.html
index 6aaa432..09e073e 100644
--- a/templates/influences/email/influence_changed.html
+++ b/templates/influences/email/influence_changed.html
@@ -1,4 +1,6 @@
-{% load i18n %}{% load gapless %}{% autoescape off %}{% gapless %}
+{% load gapless %}{% gapless %}
+{% load i18n %}
+{% autoescape off %}
 From: Inschrijfsysteem <inschrijf@evolution-events.nl>
 {% if created %}
 Subject: {% blocktrans %}Influence "{{ influence }}" submitted.{% endblocktrans %}
@@ -7,9 +9,7 @@ Subject: {% blocktrans %}Influence "{{ influence }}" was changed.{% endblocktran
 {% endif%}
 \\
 {% if recipients.0.first_name %}
-{% blocktrans with recipients.0.first_name as name %}
-Hello {{ name }},
-{% endblocktrans %}
+{% blocktrans with recipients.0.first_name as name %}Hello {{ name }}{% endblocktrans %},
 {% else %}
 {% trans "L.S." %},
 {% endif %}
@@ -29,9 +29,14 @@ You have submitted an influence on {{ creation_date }}.
 {% filter ljust:20%}{% trans "Status" %}:{%endfilter%}{{ influence.get_status_display }}
 {% filter ljust:20%}{% trans "Long term" %}:{%endfilter%}{{ influence.longterm|yesno|capfirst }}
 {% 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 %}