From d039f2a031be9e250873dc393c09a2df45524515 Mon Sep 17 00:00:00 2001 From: yomguy Date: Mon, 18 Feb 2013 22:45:22 +0100 Subject: [PATCH] fix mess --- teleforma/templates/postman/email_user.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/teleforma/templates/postman/email_user.txt b/teleforma/templates/postman/email_user.txt index 1e1f3e7b..84537f35 100644 --- a/teleforma/templates/postman/email_user.txt +++ b/teleforma/templates/postman/email_user.txt @@ -6,11 +6,11 @@ {{ object.moderation_reason }}{% else %}.{% endif %} {% else %}{# 'acceptance' #} -{% if object.parent_id %}{% if object.parent.sender_id == object.recipient_id %}{% blocktrans with object.parent.sent_at|date:"DATETIME_FORMAT" as date and object.sender.first_name as first_name and object.recipient.last_name as last_name %}On {{ date }}, you sent a message to {{ first_name }} {{ last_name }}.{% endblocktrans %} +{% if object.parent_id %}{% if object.parent.sender_id == object.recipient_id %}{% blocktrans with object.parent.sent_at|date:"DATETIME_FORMAT" as date and object.sender.first_name as first_name and object.sender.last_name as last_name %}On {{ date }}, you sent a message to {{ first_name }} {{ last_name }}.{% endblocktrans %} {% trans "Your correspondent has given you an answer." %} -{% else %}{% blocktrans with object.sender.first_name as first_name and object.recipient.last_name as last_name %}You have received a copy of a response from {{ first_name }} {{ last_name }}.{% endblocktrans %} +{% else %}{% blocktrans with object.sender.first_name as first_name and object.sender.last_name as last_name %}You have received a copy of a response from {{ first_name }} {{ last_name }}.{% endblocktrans %} {% endif %} -{% else %}{% blocktrans with object.sender.first_name as first_name and object.recipient.last_name as last_name %}You have received a message from {{ first_name }} {{ last_name }}.{% endblocktrans %} +{% else %}{% blocktrans with object.sender.first_name as first_name and object.sender.last_name as last_name %}You have received a message from {{ first_name }} {{ last_name }}.{% endblocktrans %} {% endif %}{% endif %}{% trans "You can read and respond to this message from your e-learning desk following this link:" %} http://{{ site.name }}/messages/inbox/ -- 2.39.5