update locale

diff --git a/teleforma/exam/templates/exam/script_detail.html b/teleforma/exam/templates/exam/script_detail.html
index e85398889757b815ee94fc9f0eb40f934f3a6c5f..d46dde5b9defe1562c2b0f6c5630f96043014378 100644 (file)
--- a/teleforma/exam/templates/exam/script_detail.html
+++ b/teleforma/exam/templates/exam/script_detail.html
@@ -29,6 +29,14 @@
 
         });
 
+        $( "#dialog_comments" ).dialog({
+            autoOpen: false,
+            draggable: false,
+            resizable: false,
+                    modal: true,
+
+        });
+
         $( "#opener_mark" ).click(function() {
             $( "#dialog_mark" ).dialog({ width: 500 });
             $( "#dialog_mark" ).dialog( "open");
@@ -40,6 +48,11 @@
             return false;
         });
 
+        $( "#opener_comments" ).click(function() {
+            $( "#dialog_comments" ).dialog( "open");
+            return false;
+        });
+
         var b1 = $('#validate_button');
         b1.unbind('click').click(function() {
             $(window).unbind('beforeunload');
@@ -75,14 +88,15 @@
 
         {% if script.score %}
         <a id="score" href="#" class="component_icon button icon_ok">{% trans "Score" %} : {{ script.score|floatformat }}/20</a>
+        <a id="opener_comments" href="#" class="component_icon button icon_ok">{% trans "Comments" %}</a>
         {% elif script.status == 0 %}
         <a href="#" class="component_icon button icon_delete">{% trans "Rejected" %}</a>
         {% else %}
          {% if user.correctors.all %}
-               <a id="opener_mark" href="#" class="component_icon button icon_edit">{% trans "Mark" %}</a>
+               <a id="opener_mark" href="#" class="component_icon button icon_edit">{% trans "Scoring" %}</a>
                <a id="opener_reject" href="#" class="component_icon button icon_delete">{% trans "Reject" %}</a>
          {% else %}
-               <a id="opener_mark" href="#" class="component_icon button icon_time">{% trans "Submitted" %}</a>
+               <a href="#" class="component_icon button icon_ok">{% trans "Submitted" %}</a>
          {% endif %}
         {% endif %}
 
@@ -90,6 +104,10 @@
 
 </div>
 
+<div id="dialog_comments" title="{% trans "Comments" %}" style="width: 400px;">
+ {{ script.comments }}
+</div>
+
 <div id="dialog_mark" title="{% trans "Mark" %}" style="width: 400px;">
     <form method="post" id="_MarkForm" action="">{% csrf_token %}
        <table>

diff --git a/teleforma/exam/templates/exam/script_form.html b/teleforma/exam/templates/exam/script_form.html
index 72bd158e22e81e8186b7bcf610f3b3a09286232c..ee8512aaaab8332f7b9003bf14247ae8950a5c26 100644 (file)
--- a/teleforma/exam/templates/exam/script_form.html
+++ b/teleforma/exam/templates/exam/script_form.html
@@ -25,8 +25,7 @@
 {% trans "New script" %}
 </div>
 
-<div title="{% trans "Mark" %}" style="width: 400px;">
-
+<div class="course_content" id="media_infos">
     <form method="post" id="_ScriptForm" action="">{% csrf_token %}
        <table>
        <tr><td colspan="2">{% for error in form.non_field_errors %}<li class="error">{{ error }}</li>{% endfor %}</td></tr>
@@ -43,8 +42,10 @@
        </table>
     </form>
     <br />
+    <center>
     <a href="#" id="submit_button" class="component_icon button icon_ok">{% trans "Submit" %}</a>
-
+    </center>
+    <br /><br />
 
 </div>
 </div>

diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo
index 571834f25d8589fed157f29a618d9ee3feaf2e19..8459be5df0bfc06309154bee70977f938c6f536f 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 7bfab6ad3c131a95e16243de596ade58bfd69937..5d5bdddfb6008a3c4f276b4b3664490dd16a1993 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: 2014-06-12 14:39+0200\n"
+"POT-Creation-Date: 2014-06-13 02:42+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"
@@ -16,15 +16,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: exam/models.py:60 exam/models.py:311
-#, fuzzy
+#: exam/models.py:60 exam/models.py:310
 msgid "rejected"
-msgstr " rejeté"
+msgstr "rejeté"
 
 #: exam/models.py:60
-#, fuzzy
 msgid "draft"
-msgstr "Brouillon"
+msgstr "brouillon"
 
 #: exam/models.py:60
 msgid "submitted"
@@ -117,19 +115,17 @@ msgstr "Type mime"
 msgid "sha1"
 msgstr ""
 
-#: exam/models.py:165 exam/models.py:297 exam/models.py:310
-#, fuzzy
+#: exam/models.py:165 exam/models.py:297 exam/models.py:309
 msgid "script"
-msgstr "description"
+msgstr "copie"
 
 #: exam/models.py:166
-#, fuzzy
 msgid "Page file"
-msgstr "Profil"
+msgstr "Fichier de page"
 
 #: exam/models.py:167
 msgid "Image file"
-msgstr ""
+msgstr "Fichier image"
 
 #: exam/models.py:168 models/pro.py:49 models/pro.py:85
 msgid "rank"
@@ -137,12 +133,11 @@ msgstr "rang"
 
 #: exam/models.py:171
 msgid "Page"
-msgstr ""
+msgstr "Page"
 
 #: exam/models.py:172
-#, fuzzy
 msgid "Pages"
-msgstr "Messages"
+msgstr "Pages"
 
 #: exam/models.py:177 models/core.py:93 models/core.py:106 models/core.py:128
 #: models/core.py:140 models/core.py:234 models/core.py:475 models/crfpa.py:47
@@ -178,9 +173,8 @@ msgid "author"
 msgstr "auteur"
 
 #: exam/models.py:196
-#, fuzzy
 msgid "PDF file"
-msgstr "fichier"
+msgstr "Fichier PDF"
 
 #: exam/models.py:197
 msgid "Box UUID"
@@ -212,7 +206,6 @@ msgid "date marked"
 msgstr "date de correction"
 
 #: exam/models.py:205
-#, fuzzy
 msgid "date rejected"
 msgstr "date de rejet"
 
@@ -224,12 +217,12 @@ msgstr ""
 msgid "Script"
 msgstr "Copie"
 
-#: exam/models.py:214 exam/templates/exam/scripts.html:43
-#: templates/telemeta/base.html:116
+#: exam/models.py:214 exam/templates/exam/scripts.html:21
+#: exam/templates/exam/scripts.html:51 templates/telemeta/base.html:116
 msgid "Scripts"
 msgstr "Copies"
 
-#: exam/templates/exam/script_detail.html:76
+#: exam/templates/exam/script_detail.html:85
 #: exam/templates/exam/inc/script_list.html:15 models/core.py:503
 #: templates/teleforma/course.html:50
 #: templates/teleforma/course_conference.html:40
@@ -243,35 +236,54 @@ msgstr "Copies"
 msgid "Session"
 msgstr "Session"
 
-#: exam/templates/exam/script_detail.html:81
-#, fuzzy
-msgid "Score : "
+#: exam/templates/exam/script_detail.html:90
+#: exam/templates/exam/inc/script_list.html:19
+msgid "Score"
 msgstr "Note"
 
-#: exam/templates/exam/script_detail.html:83 templates/postman/view.html:25
+#: exam/templates/exam/script_detail.html:91
+#: exam/templates/exam/script_detail.html:107
+msgid "Comments"
+msgstr "Commentaire"
+
+#: exam/templates/exam/script_detail.html:93
+#: exam/templates/exam/scripts.html:27 templates/postman/view.html:25
 msgid "Rejected"
 msgstr "Rejeté"
 
-#: exam/templates/exam/script_detail.html:85
-#: exam/templates/exam/script_detail.html:93
-msgid "Mark"
-msgstr "Note"
+#: exam/templates/exam/script_detail.html:96
+msgid "Scoring"
+msgstr "Noter"
 
-#: exam/templates/exam/script_detail.html:86
-#: exam/templates/exam/script_detail.html:114
-#: exam/templates/exam/script_detail.html:131
+#: exam/templates/exam/script_detail.html:97
+#: exam/templates/exam/script_detail.html:132
+#: exam/templates/exam/script_detail.html:149
 msgid "Reject"
 msgstr "Rejeter"
 
-#: exam/templates/exam/script_detail.html:110
-#, fuzzy
+#: exam/templates/exam/script_detail.html:99
+msgid "Submitted"
+msgstr "Soumise"
+
+#: exam/templates/exam/script_detail.html:111
+msgid "Mark"
+msgstr "Note"
+
+#: exam/templates/exam/script_detail.html:128
 msgid "Validate"
-msgstr "validé"
+msgstr "Validée"
 
-#: exam/templates/exam/scripts.html:6 exam/templates/exam/scripts.html:21
-#, fuzzy
+#: exam/templates/exam/script_form.html:25 exam/templates/exam/scripts.html:35
+msgid "New script"
+msgstr "Nouvelle copie"
+
+#: exam/templates/exam/script_form.html:46
+msgid "Submit"
+msgstr "Soumettre"
+
+#: exam/templates/exam/scripts.html:6
 msgid "Answers"
-msgstr "Réponse"
+msgstr "Réponses"
 
 #: exam/templates/exam/scripts.html:25
 msgid "Pending"
@@ -281,9 +293,9 @@ msgstr "En attente"
 msgid "Treated"
 msgstr "Traîtées"
 
-#: exam/templates/exam/scripts.html:48
+#: exam/templates/exam/scripts.html:56
 msgid "No scripts"
-msgstr "Aucune Copie"
+msgstr "Aucune copie"
 
 #: exam/templates/exam/inc/script_list.html:12
 #: templates/telemeta/profile_detail.html:60
@@ -318,24 +330,6 @@ msgstr "Date de soumission"
 msgid "Mark date"
 msgstr "Date de correction"
 
-#: exam/templates/exam/inc/script_list.html:19
-msgid "Score"
-msgstr "Note"
-
-#: exam/templates/exam/inc/script_list.html:20
-#: templates/teleforma/course_conference_record.html:30
-#: templates/teleforma/courses.html:107
-msgid "Status"
-msgstr "Status"
-
-#: exam/templates/exam/inc/script_list.html:36
-msgid " marked"
-msgstr " corrigée"
-
-#: exam/templates/exam/inc/script_list.html:38
-msgid " pending"
-msgstr " en attente"
-
 #: models/ae.py:49 models/crfpa.py:117
 msgid "platform only"
 msgstr "plateforme seulement"
@@ -720,7 +714,7 @@ msgstr ""
 msgid "Sent Messages"
 msgstr "Messages"
 
-#: templates/postman/base.html:17 templates/telemeta/base.html:126
+#: templates/postman/base.html:17 templates/telemeta/base.html:128
 msgid "Archives"
 msgstr ""
 
@@ -955,7 +949,7 @@ msgid "Write"
 msgstr ""
 
 #: templates/teleforma/annals.html:6 templates/teleforma/annals.html.py:54
-#: templates/telemeta/base.html:113 templates/telemeta/base.html.py:131
+#: templates/telemeta/base.html:113 templates/telemeta/base.html.py:133
 msgid "Annals"
 msgstr "Annales"
 
@@ -1092,6 +1086,11 @@ msgstr "Début"
 msgid "End"
 msgstr "Fin"
 
+#: templates/teleforma/course_conference_record.html:30
+#: templates/teleforma/courses.html:107
+msgid "Status"
+msgstr "Status"
+
 #: templates/teleforma/course_conference_record.html:41
 #: templates/teleforma/courses.html:42
 msgid "New conference"
@@ -1133,8 +1132,8 @@ msgstr "Mes notes"
 msgid "New note"
 msgstr "Nouvelle note"
 
-#: templates/teleforma/help.html:11 templates/telemeta/base.html:136
-#: templates/telemeta/base.html.py:149
+#: templates/teleforma/help.html:11 templates/telemeta/base.html:138
+#: templates/telemeta/base.html.py:151
 msgid "Help"
 msgstr "Aide"
 
@@ -1183,39 +1182,39 @@ msgstr "Messagerie"
 msgid "Users"
 msgstr ""
 
-#: templates/telemeta/base.html:128 templates/telemeta/search_criteria.html:69
+#: templates/telemeta/base.html:130 templates/telemeta/search_criteria.html:69
 msgid "Search"
 msgstr ""
 
-#: templates/telemeta/base.html:129
+#: templates/telemeta/base.html:131
 msgid "Collections"
 msgstr ""
 
-#: templates/telemeta/base.html:130
+#: templates/telemeta/base.html:132
 msgid "Items"
 msgstr ""
 
-#: templates/telemeta/base.html:134
+#: templates/telemeta/base.html:136
 msgid "Admin"
 msgstr ""
 
-#: templates/telemeta/base.html:146
+#: templates/telemeta/base.html:148
 msgid "Profile"
 msgstr "Profil"
 
-#: templates/telemeta/base.html:148
+#: templates/telemeta/base.html:150
 msgid "Lists"
 msgstr ""
 
-#: templates/telemeta/base.html:151
+#: templates/telemeta/base.html:153
 msgid "Sign out"
 msgstr ""
 
-#: templates/telemeta/base.html:193
+#: templates/telemeta/base.html:195
 msgid "Powered by"
 msgstr ""
 
-#: templates/telemeta/base.html:203
+#: templates/telemeta/base.html:205
 msgid "Legal notices"
 msgstr ""
 
@@ -1442,6 +1441,16 @@ msgstr ""
 msgid "A new live conference has started : "
 msgstr "Une nouvelle conférence en direct a commencé : "
 
+#, fuzzy
+#~ msgid "Score : "
+#~ msgstr "Note"
+
+#~ msgid " marked"
+#~ msgstr " corrigée"
+
+#~ msgid " pending"
+#~ msgstr " en attente"
+
 #~ msgid "AE students"
 #~ msgstr "Etudiants AE"