update testimonials

diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo
index 6dca9a69825870e1ea4f8ccd101facb0c3e0e92c..9e09ca2dc48fc13f62563f53096520d204ed7b9e 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 bfc7924300cc0f13527f546ea127289d4abdd687..aca90664a97d453d5bcf6d1345137cd865478a82 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-06-12 13:08+0200\n"
+"POT-Creation-Date: 2013-06-12 17:47+0200\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"
@@ -412,7 +412,6 @@ msgstr "formulaire"
 
 #: models/pro.py:131 templates/teleforma/answer_form.html:112
 #: templates/teleforma/seminar_detail.html:162
-#: templates/teleforma/testimonials.html:56
 #: templates/teleforma/inc/answer_list.html:14
 msgid "Seminar"
 msgstr "Séminaire"
@@ -460,7 +459,7 @@ msgstr "date de validation"
 
 #: models/pro.py:186 templates/teleforma/answer_detail.html:45
 #: templates/teleforma/answer_form.html:115
-#: templates/teleforma/seminar_testimonial_knowledge.html:43
+#: templates/teleforma/seminar_testimonial_knowledge.html:44
 msgid "Answer"
 msgstr "Réponse à la consultation"
 
@@ -1208,7 +1207,7 @@ msgid "Training begin date"
 msgstr "Date de début de formation"
 
 #: templates/teleforma/seminar_testimonial.html:42
-#: templates/teleforma/seminar_testimonial_knowledge.html:44
+#: templates/teleforma/seminar_testimonial_knowledge.html:48
 msgid "Training end date"
 msgstr "Date de fin de formation"
 
@@ -1226,8 +1225,16 @@ msgid "Reply to questions"
 msgstr "Réalisation de consultations juridiques fictives"
 
 #: templates/teleforma/seminar_testimonial_knowledge.html:42
-msgid "Knowledge validation dates"
-msgstr "Date de validation des acquis"
+msgid "Knowledge validation dates and terms"
+msgstr "Dates et modalités de validation des acquis"
+
+#: templates/teleforma/seminar_testimonial_knowledge.html:45
+msgid "Required characters"
+msgstr "Caractères requis"
+
+#: templates/teleforma/seminar_testimonial_knowledge.html:46
+msgid "Submitted characters"
+msgstr "Caractères soumis"
 
 #: templates/teleforma/seminar_testimonial_payback.html:90
 msgid "until"
@@ -1249,6 +1256,11 @@ msgstr "Attestations"
 msgid "validated on"
 msgstr "validée le"
 
+#: templates/teleforma/testimonials.html:69
+#: templates/teleforma/testimonials.html:75
+msgid "only to have support of the training costs"
+msgstr "uniquement pour la prise en charge des frais de formation"
+
 #: templates/teleforma/testimonials.html:75
 msgid "Payback testimonial"
 msgstr "Attestation de présence et de règlement"

diff --git a/teleforma/templates/teleforma/seminar_testimonial_knowledge.html b/teleforma/templates/teleforma/seminar_testimonial_knowledge.html
index 8c6bac656ec31ebcc7fdcd5862ad085011b58806..a823df6c653d88de59d55b22b408e6f40c35f72e 100644 (file)
--- a/teleforma/templates/teleforma/seminar_testimonial_knowledge.html
+++ b/teleforma/templates/teleforma/seminar_testimonial_knowledge.html
@@ -39,8 +39,12 @@
       <tr><td class="bold">{% trans "Duration" %} : </td><td>{{ seminar.duration|hours }} {% trans "hours" %}</td></tr>
       <tr><td class="bold">{% trans "Validation mode of the training" %} : </td><td>{% trans "Reply to questions" %}</td></tr>
       <tr><td class="bold">{% trans "Training begin date" %} : </td><td>{{ first_revision.date|date:'j F Y' }}</td></tr>
-      <tr><td class="bold">{% trans "Knowledge validation dates" %} : </td><td></td></tr>
-      {% for answer in answers %}<tr><td style="padding-left:10px;">{% trans "Answer" %} n°{{ answer.question.rank }} : </td><td>{{ answer.date_validated|date:'j F Y' }}</td></tr>{% endfor %}
+      <tr><td class="bold">{% trans "Knowledge validation dates and terms" %} : </td><td></td></tr>
+      {% for answer in answers %}
+        <tr style="padding-top: -2px;"><td style="padding-left:10px;">{% trans "Answer" %} n°{{ answer.question.rank }} : </td><td>{{ answer.date_validated|date:'j F Y' }}</td></tr>
+        <tr style="padding-top: -2px;"><td style="padding-left:20px;">{% trans "Required characters" %} : </td><td>{{ answer.question.min_nchar }}</td></tr>
+        <tr style="padding-top: -2px;"><td style="padding-left:20px;">{% trans "Submitted characters" %} : </td><td>{{ answer.answer|length }}</td></tr>
+      {% endfor %}
       <tr><td class="bold">{% trans "Training end date" %} : </td><td>{% if testimonial.date_modified %}{{ testimonial.date_modified|date:'j F Y' }}{% else %}{{ testimonial.date_added|date:'j F Y' }}{% endif %}</td></tr>
     </table>
 

diff --git a/teleforma/templates/teleforma/testimonials.html b/teleforma/templates/teleforma/testimonials.html
index af766716aec0222cabbef0eefa98055f69f04b03..2d19125342f80116e7a0ede653628b5465c8660b 100644 (file)
--- a/teleforma/templates/teleforma/testimonials.html
+++ b/teleforma/templates/teleforma/testimonials.html
@@ -53,7 +53,7 @@
  {% for testimonial in object_list %}
   <div class="course_content">
     <div class="course_subtitle">
-      <h3><img src="{{ STATIC_URL }}/telemeta/images/item_title.png" width="10px" alt="" /> {% trans "Seminar" %} : {% if testimonial.seminar %}{{ testimonial.seminar.title }}{% else %}{{ testimonial.title }}{% endif %}</h3>
+      <h3><img src="{{ STATIC_URL }}/telemeta/images/item_title.png" width="10px" alt="" /> {% if testimonial.seminar %}{{ testimonial.seminar.title }}{% else %}{{ testimonial.title }}{% endif %}</h3>
     </div>
 
    <table class="listing" width="100%">
@@ -66,13 +66,13 @@
     </tr>
 
     <tr>
-     <td><a href="{% url teleforma-seminar-testimonial-knowledge testimonial.seminar.id %}?format=pdf" target="_blank"><img src="{{ STATIC_URL }}/teleforma/images/application-msword.png" style="vertical-align:middle" alt="" /> {% trans "Knowledge validation testimonial" %}</a></td>
+     <td><a href="{% url teleforma-seminar-testimonial-knowledge testimonial.seminar.id %}?format=pdf" target="_blank"><img src="{{ STATIC_URL }}/teleforma/images/application-msword.png" style="vertical-align:middle" alt="" /> {% trans "Knowledge validation testimonial" %} ({% trans "only to have support of the training costs" %})</a></td>
      <td>{% trans "validated on" %} {{ testimonial.date_added }}</td>
      <td><a href="{% url teleforma-seminar-testimonial-knowledge testimonial.seminar.id %}?format=pdf" target="_blank"><img src="{{ STATIC_URL }}teleforma/images/download.png" style="vertical-align:middle" alt="" title="{% trans "Download" %}" /></a></td>
     </tr>
 
     <tr>
-     <td><a href="{% url teleforma-seminar-testimonial-payback testimonial.seminar.id %}?format=pdf" target="_blank"><img src="{{ STATIC_URL }}/teleforma/images/application-msword.png" style="vertical-align:middle" alt="" /> {% trans "Payback testimonial" %}</td>
+     <td><a href="{% url teleforma-seminar-testimonial-payback testimonial.seminar.id %}?format=pdf" target="_blank"><img src="{{ STATIC_URL }}/teleforma/images/application-msword.png" style="vertical-align:middle" alt="" /> {% trans "Payback testimonial" %} ({% trans "only to have support of the training costs" %})</td>
      <td>{% trans "validated on" %} {{ testimonial.date_added }}</td>
      <td><a href="{% url teleforma-seminar-testimonial-payback testimonial.seminar.id %}?format=pdf" target="_blank"><img src="{{ STATIC_URL }}teleforma/images/download.png" style="vertical-align:middle" alt="" title="{% trans "Download" %}" /></a></td>
     </tr>