From ecd3ab2dabc5319f82a221e822e980161a3647ff Mon Sep 17 00:00:00 2001 From: Matthijs Kooijman Date: Sat, 9 Feb 2008 00:22:24 +0100 Subject: [PATCH] * Update influence_changed template to use the gapless template tag, which makes it a tiny bit more readable. --- .../influences/email/influence_changed.html | 32 +++++++++++++++---- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/templates/influences/email/influence_changed.html b/templates/influences/email/influence_changed.html index ea98d9b..6aaa432 100644 --- a/templates/influences/email/influence_changed.html +++ b/templates/influences/email/influence_changed.html @@ -1,11 +1,28 @@ -{% load i18n%}{% autoescape off %}From: Inschrijfsysteem -Subject: {% if created %}{% blocktrans %}Influence "{{ influence }}" submitted.{% endblocktrans %}{% else %}{% blocktrans %}Influence "{{ influence }}" 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 %}, +{% load i18n %}{% load gapless %}{% autoescape off %}{% gapless %} +From: Inschrijfsysteem +{% 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 %} +{% 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 }}.{% endblocktrans %} -{% if not created %}{% blocktrans %}The influence has been modified. The current status is{%endblocktrans %}:{% else %}{% blocktrans %}You submitted{% endblocktrans%}:{% endif %} +{% blocktrans with influence.created|date:"j F Y" as creation_date %} +You have submitted an influence 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 "Summary" %}:{%endfilter%}{{ influence.summary }} @@ -16,4 +33,5 @@ Subject: {% if created %}{% blocktrans %}Influence "{{ influence }}" submitted.{ {% if influence.result %} {% trans "Result" %}: {% filter wordwrap:72 %}{{ influence.result }}{% endfilter %} -{% endif %}{% endautoescape %} +{% endif %} +{% endgapless %}{% endautoescape %} -- 2.30.2