again

diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo
index 6838c8176c4339c6cfb73af47bc594e44e73fb86..cf92356d1bd306ecf3e6b56c51d354ee7c3e223a 100644 (file)
Binary files a/teleforma/locale/fr/LC_MESSAGES/django.mo and b/teleforma/locale/fr/LC_MESSAGES/django.mo differ

diff --git a/teleforma/locale/fr/LC_MESSAGES/django.po b/teleforma/locale/fr/LC_MESSAGES/django.po
index 8c19b1f509dad57266e0bbfb505395d01ba4332f..bdd0b910296fb74de459c131a1e37f41c659adc0 100644 (file)
--- 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 22:29+0100\n"
+"POT-Creation-Date: 2013-02-18 22:37+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"
@@ -622,13 +622,11 @@ msgid "Hello"
 msgstr "Bonjour"
 
 #: templates/postman/email_user.txt:3
-#, fuzzy, python-format
+#, python-format
 msgid ""
-"On %(date)s, you asked to send a message to the user '%(first_name)s "
-"%(last_name)s'."
+"On %(date)s, you asked to send a message to %(first_name)s %(last_name)s."
 msgstr ""
-"Le %(date)s, vous avez envoyé un message à %(sender.first_name)s "
-"%(sender.last_name)s."
+"Le %(date)s, vous avez envoyé un message à %(first_name)s %(last_name)s."
 
 #: templates/postman/email_user.txt:5 templates/postman/email_visitor.txt:5
 msgid "Your message has been rejected by the moderator"
@@ -639,32 +637,26 @@ msgid ", for the following reason:"
 msgstr ""
 
 #: templates/postman/email_user.txt:9
-#, fuzzy, python-format
-msgid ""
-"On %(date)s, you sent a message to the user '%(first_name)s %(last_name)s'."
+#, python-format
+msgid "On %(date)s, you sent a message to %(first_name)s %(last_name)s."
 msgstr ""
-"Le %(date)s, vous avez envoyé un message à %(sender.first_name)s "
-"%(sender.last_name)s."
+"Le %(date)s, vous avez envoyé un message à %(first_name)s %(last_name)s."
 
 #: templates/postman/email_user.txt:10
 msgid "Your correspondent has given you an answer."
 msgstr "Votre correspondant vous a donné une réponse."
 
 #: templates/postman/email_user.txt:11
-#, fuzzy, python-format
+#, python-format
 msgid ""
-"You have received a copy of a response from the user '%(first_name)s "
-"%(last_name)s'."
+"You have received a copy of a response from %(first_name)s %(last_name)s."
 msgstr ""
-"Vous avez reçu une copie de la réponse de %(sender.first_name)s "
-"%(sender.last_name)s."
+"Vous avez reçu une copie de la réponse de %(first_name)s %(last_name)s."
 
 #: templates/postman/email_user.txt:13
-#, fuzzy, python-format
-msgid ""
-"You have received a message from the user '%(first_name)s %(last_name)s'."
-msgstr ""
-"Vous avez reçu un message de %(sender.first_name)s %(sender.last_name)s."
+#, python-format
+msgid "You have received a message from %(first_name)s %(last_name)s."
+msgstr "Vous avez reçu un message de %(first_name)s %(last_name)s."
 
 #: templates/postman/email_user.txt:14
 msgid ""

diff --git a/teleforma/templates/postman/email_user.txt b/teleforma/templates/postman/email_user.txt
index 3ff6c7f1f9f0904202068cbac51eb7315cd3ddda..1e1f3e7b45656d0d1a7ce3856e232b0b947fcd6b 100644 (file)
--- a/teleforma/templates/postman/email_user.txt
+++ b/teleforma/templates/postman/email_user.txt
@@ -1,23 +1,23 @@
 {% 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.recipient.first_name as first_name and object.recipient.last_name as last_name %}On {{ date }}, you asked to send a message to the user '{{ first_name }} {{ last_name }}'.{% endblocktrans %}
+{% blocktrans with object.sent_at|date:"DATETIME_FORMAT" as date and object.recipient.first_name as first_name and object.recipient.last_name as last_name %}On {{ date }}, you asked to send a message to {{ first_name }} {{ 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.sender.first_name as first_name and object.recipient.last_name as last_name %}On {{ date }}, you sent a message to the user '{{ 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.recipient.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 the user '{{ first_name }} {{ last_name }}'.{% endblocktrans %}
+{% 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 %}
 {% 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 the user '{{ first_name }} {{ last_name }}'.{% endblocktrans %}
+{% 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 %}
 {% endif %}{% endif %}{% trans "You can read and respond to this message from your e-learning desk following this link:" %}
 
 http://{{ site.name }}/messages/inbox/
 {# 'acceptance' #}
 
 {% trans "Thank you again for your interest in our services." %}
-{% trans "The site administrator" %} {% trans "of" %} {% organization %}
+{% trans "The site administrator" %} {% trans "of" %} {% organization %}.
 
 {% blocktrans %}Note: This message is issued by an automated system.
 Do not reply, this would not be taken into account.{% endblocktrans %}{% endautoescape %}
\ No newline at end of file