From 20fb5061c0d608e17c474a26bc8e19478c92132d Mon Sep 17 00:00:00 2001 From: Matthijs Kooijman Date: Fri, 1 Feb 2008 12:14:35 +0100 Subject: [PATCH] * Add a greeting to the influence_changed email. --- locale/nl/LC_MESSAGES/django.po | 37 ++++++++++--------- .../influences/email/influence_changed.html | 1 + 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/locale/nl/LC_MESSAGES/django.po b/locale/nl/LC_MESSAGES/django.po index 7971b3a..48cc827 100644 --- a/locale/nl/LC_MESSAGES/django.po +++ b/locale/nl/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-01 11:48+0100\n" +"POT-Creation-Date: 2008-02-01 12:13+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Matthijs Kooijman \n" "Language-Team: N/A\n" @@ -33,7 +33,7 @@ msgstr "Speler" #: influences/models.py:19 influences/models.py:32 #: templates/influences/influence_detail.html:9 -#: templates/influences/email/influence_changed.html:8 +#: templates/influences/email/influence_changed.html:9 msgid "Character" msgstr "Karakter" @@ -58,32 +58,32 @@ msgid "Done" msgstr "Afgehandeld" #: influences/models.py:33 templates/influences/influence_detail.html:8 -#: templates/influences/email/influence_changed.html:9 +#: templates/influences/email/influence_changed.html:10 msgid "Contact" msgstr "Contact" #: influences/models.py:34 -#: templates/influences/email/influence_changed.html:10 +#: templates/influences/email/influence_changed.html:11 msgid "Summary" msgstr "Samenvatting" #: influences/models.py:35 -#: templates/influences/email/influence_changed.html:13 +#: templates/influences/email/influence_changed.html:14 msgid "Description" msgstr "Omschrijving" #: influences/models.py:36 -#: templates/influences/email/influence_changed.html:11 +#: templates/influences/email/influence_changed.html:12 msgid "Status" msgstr "Status" #: influences/models.py:37 -#: templates/influences/email/influence_changed.html:12 +#: templates/influences/email/influence_changed.html:13 msgid "Long term" msgstr "Lange termijn" #: influences/models.py:39 -#: templates/influences/email/influence_changed.html:16 +#: templates/influences/email/influence_changed.html:17 msgid "Result" msgstr "Resultaat" @@ -180,21 +180,24 @@ msgstr "Influence \"%(influence)s\" submitted." msgid "Influence \"%(influence)s\" was changed." msgstr "Invloed \"%(influence)s\" is veranderd." -#: templates/influences/email/influence_changed.html:5 +#: templates/influences/email/influence_changed.html:4 +#, python-format +msgid "Hello %(name)s" +msgstr "Hallo %(name)s" + +#: templates/influences/email/influence_changed.html:4 +msgid "L.S." +msgstr "L.S." + +#: templates/influences/email/influence_changed.html:6 #, python-format msgid "You have submitted an influence on %(creation_date)s." msgstr "Je hebt een invloed ingedient op %(creation_date)s." -#: templates/influences/email/influence_changed.html:6 +#: templates/influences/email/influence_changed.html:7 msgid "The influence has been modified. The current status is" msgstr "De invloed is veranderd. De status is nu" -#: templates/influences/email/influence_changed.html:6 +#: templates/influences/email/influence_changed.html:7 msgid "You submitted" msgstr "Je hebt ingediend" - -#~ msgid "Influence added." -#~ msgstr "Invloed toegevoegd." - -#~ msgid "Character added." -#~ msgstr "Karakter toegevoegd" diff --git a/templates/influences/email/influence_changed.html b/templates/influences/email/influence_changed.html index 2e12da0..6431ff0 100644 --- a/templates/influences/email/influence_changed.html +++ b/templates/influences/email/influence_changed.html @@ -1,6 +1,7 @@ {% 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 %}, {% filter wordwrap:72 %} {% blocktrans with influence.created 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 %} -- 2.30.2