From: yomguy <yomguy@parisson.com>
Date: Mon, 18 Feb 2013 16:36:49 +0000 (+0100)
Subject: fix notif
X-Git-Tag: 0.9-probarreau~42
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9ca9c4873a89c945fc9b31b17522adfb5a3e77d0;p=teleforma.git

fix notif
---

diff --git a/teleforma/locale/fr/LC_MESSAGES/django.po b/teleforma/locale/fr/LC_MESSAGES/django.po
index 17dce965..5fa143df 100644
--- a/teleforma/locale/fr/LC_MESSAGES/django.po
+++ b/teleforma/locale/fr/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-18 17:29+0100\n"
+"POT-Creation-Date: 2013-02-18 17:26+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Guillaume Pellerin <yomguy@parisson.com>\n"
 "Language-Team: LANGUAGE <lists@parisson.com>\n"
diff --git a/teleforma/templates/postman/email_user.txt b/teleforma/templates/postman/email_user.txt
index 9fb938c2..e1df3a11 100644
--- a/teleforma/templates/postman/email_user.txt
+++ b/teleforma/templates/postman/email_user.txt
@@ -1,16 +1,16 @@
 {% load i18n %}{% load telemeta_utils %}{% load teleforma_tags %}{% autoescape off %}{% trans "Hello" %} {{ usr.first_name }} {{ usr.last_name }},
 {% if action == 'rejection' %}
-{% blocktrans with object.sent_at|date:"DATETIME_FORMAT" as date and object.obfuscated_recipient as recipient %}On {{ date }}, you asked to send a message to {{ recipient.first_name }} {{ recipient.last_name }}.{% endblocktrans %}
+{% blocktrans with object.sent_at|date:"DATETIME_FORMAT" as date and object.recipient as recipient %}On {{ date }}, you asked to send a message to {{ recipient.first_name }} {{ recipient.last_name }}.{% endblocktrans %}
 
 {% trans "Your message has been rejected by the moderator" %}{% if object.moderation_reason %}{% trans ", for the following reason:" %}
     {{ 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.obfuscated_sender as sender %}On {{ date }}, you sent a message to {{ sender.first_name }} {{ sender.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 as sender %}On {{ date }}, you sent a message to {{ sender.first_name }} {{ sender.last_name }}.{% endblocktrans %}
 {% trans "Your correspondent has given you an answer." %}
-{% else %}{% blocktrans with object.obfuscated_sender as sender %}You have received a copy of a response from {{ sender.first_name }} {{ sender.last_name }}.{% endblocktrans %}
+{% else %}{% blocktrans with object.sender as sender %}You have received a copy of a response from {{ sender.first_name }} {{ sender.last_name }}.{% endblocktrans %}
 {% endif %}
-{% else %}{% blocktrans with object.obfuscated_sender as sender %}You have received a message from {{ sender.first_name }} {{ sender.last_name }}.{% endblocktrans %}
+{% else %}{% blocktrans with object.sender as sender %}You have received a message from {{ sender.first_name }} {{ sender.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/