From e2575fb217be437776d32df53a8da6ea519e7a6b Mon Sep 17 00:00:00 2001 From: yomguy Date: Fri, 14 Dec 2012 15:08:09 +0100 Subject: [PATCH] fix titles --- teleforma/locale/fr/LC_MESSAGES/django.mo | Bin 9506 -> 10032 bytes teleforma/locale/fr/LC_MESSAGES/django.po | 36 +++++++++--- .../templates/teleforma/seminar_detail.html | 54 ++++++++++++++---- 3 files changed, 70 insertions(+), 20 deletions(-) diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo index b05773f06fb030df166791dad3500fb8ad3e0a8c..b8740c5088c6799dcb67f268c8a51a3f10da8a5a 100644 GIT binary patch delta 4442 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 diff --git a/teleforma/locale/fr/LC_MESSAGES/django.po b/teleforma/locale/fr/LC_MESSAGES/django.po index 0478b938..4b31b95c 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: 2012-12-14 11:49+0100\n" +"POT-Creation-Date: 2012-12-14 15:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Guillaume Pellerin \n" "Language-Team: LANGUAGE \n" @@ -961,27 +961,47 @@ msgstr "Aide" msgid "Informations" msgstr "Informations" -#: templates/teleforma/seminar_detail.html:43 +#: templates/teleforma/seminar_detail.html:44 msgid "Step 1 : read the following documents" msgstr "Étape 1 : lisez les documents suivants" -#: templates/teleforma/seminar_detail.html:49 +#: templates/teleforma/seminar_detail.html:48 +msgid "Step 1 : read the following document" +msgstr "Étape 1 : lisez le document suivant" + +#: templates/teleforma/seminar_detail.html:56 msgid "Step 2 : view the following conferences" msgstr "Étape 2 : visionnez les conférences suivantes" -#: templates/teleforma/seminar_detail.html:55 +#: templates/teleforma/seminar_detail.html:60 +msgid "Step 2 : view the following conference" +msgstr "Étape 2 : visionnez la conférence suivante" + +#: templates/teleforma/seminar_detail.html:68 msgid "Step 3 : read the following documents" -msgstr "Étape 3 : lisez les documents suivants" +msgstr "Étape 3 : lisez le documents suivants" + +#: templates/teleforma/seminar_detail.html:72 +msgid "Step 3 : read the following document" +msgstr "Étape 3 : lisez les documents suivant" -#: templates/teleforma/seminar_detail.html:61 +#: templates/teleforma/seminar_detail.html:80 msgid "Step 4 : answer to the following questions" msgstr "Étape 4 : réalisez les consultations fictives suivantes" -#: templates/teleforma/seminar_detail.html:68 +#: templates/teleforma/seminar_detail.html:84 +msgid "Step 4 : answer to the following question" +msgstr "Étape 4 : réalisez la consultation fictive suivante" + +#: templates/teleforma/seminar_detail.html:93 msgid "Step 5 : read the following corrected documents" msgstr "Étape 5 : lisez les documents corrigés suivants" -#: templates/teleforma/seminar_detail.html:83 +#: templates/teleforma/seminar_detail.html:97 +msgid "Step 5 : read the following corrected document" +msgstr "Étape 5 : lisez le document corrigé suivant" + +#: templates/teleforma/seminar_detail.html:113 msgid "Progression" msgstr "Progression" diff --git a/teleforma/templates/teleforma/seminar_detail.html b/teleforma/templates/teleforma/seminar_detail.html index 5ee4b5fc..6b3294da 100644 --- a/teleforma/templates/teleforma/seminar_detail.html +++ b/teleforma/templates/teleforma/seminar_detail.html @@ -40,34 +40,64 @@ {% with seminar.docs_1 as docs %} - {% with _("Step 1 : read the following documents") as title %} - {% include "teleforma/inc/document_simple_list.html" %} + {% if docs.all.count > 1 %} + {% with _("Step 1 : read the following documents") as title %} + {% include "teleforma/inc/document_simple_list.html" %} {% endwith %} + {% else %} + {% with _("Step 1 : read the following document") as title %} + {% include "teleforma/inc/document_simple_list.html" %} + {% endwith %} + {% endif %} {% endwith %} {% with seminar.media as media_packages %} - {% with _("Step 2 : view the following conferences") as title %} - {% include "teleforma/inc/media_package_list.html" %} - {% endwith %} + {% if media_packages.all.count > 1 %} + {% with _("Step 2 : view the following conferences") as title %} + {% include "teleforma/inc/media_package_list.html" %} + {% endwith %} + {% else %} + {% with _("Step 2 : view the following conference") as title %} + {% include "teleforma/inc/media_package_list.html" %} + {% endwith %} + {% endif %} {% endwith %} - + {% with seminar.docs_2 as docs %} - {% with _("Step 3 : read the following documents") as title %} - {% include "teleforma/inc/document_simple_list.html" %} + {% if docs.all.count > 1 %} + {% with _("Step 3 : read the following documents") as title %} + {% include "teleforma/inc/document_simple_list.html" %} {% endwith %} + {% else %} + {% with _("Step 3 : read the following document") as title %} + {% include "teleforma/inc/document_simple_list.html" %} + {% endwith %} + {% endif %} {% endwith %} - + {% with seminar.question as questions %} - {% with _("Step 4 : answer to the following questions") as title %} - {% include "teleforma/inc/question_list.html" %} - {% endwith %} + {% if questions.all.count > 1 %} + {% with _("Step 4 : answer to the following questions") as title %} + {% include "teleforma/inc/question_list.html" %} + {% endwith %} + {% else %} + {% with _("Step 4 : answer to the following question") as title %} + {% include "teleforma/inc/question_list.html" %} + {% endwith %} + {% endif %} {% endwith %} {% if validated %} {% with seminar.docs_correct as docs %} + {% if docs.all.count > 1 %} {% with _("Step 5 : read the following corrected documents") as title %} {% include "teleforma/inc/document_simple_list.html" %} {% endwith %} + {% else %} + {% with _("Step 5 : read the following corrected document") as title %} + {% include "teleforma/inc/document_simple_list.html" %} + {% endwith %} + {% endif %} {% endwith %} {% endif %} -- 2.39.5