From f3c7e33a5a7079b1da48b3827b6b972ef4978d0c Mon Sep 17 00:00:00 2001 From: yomguy Date: Mon, 18 Feb 2013 22:37:11 +0100 Subject: [PATCH] again --- teleforma/locale/fr/LC_MESSAGES/django.mo | Bin 17889 -> 18553 bytes teleforma/locale/fr/LC_MESSAGES/django.po | 34 ++++++++------------- teleforma/templates/postman/email_user.txt | 10 +++--- 3 files changed, 18 insertions(+), 26 deletions(-) diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo index 6838c8176c4339c6cfb73af47bc594e44e73fb86..cf92356d1bd306ecf3e6b56c51d354ee7c3e223a 100644 GIT binary patch delta 6105 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 delta 5701 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\n" "Language-Team: LANGUAGE \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 3ff6c7f1..1e1f3e7b 100644 --- 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 -- 2.39.5