From: Guillaume Pellerin Date: Fri, 13 Jun 2014 00:59:13 +0000 (+0200) Subject: locales X-Git-Tag: 1.1~478 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=131430779aa8325ef6f54c614f8afb116ce160b2;p=teleforma.git locales --- diff --git a/teleforma/exam/templates/exam/script_detail.html b/teleforma/exam/templates/exam/script_detail.html index d46dde5b..15597b6e 100644 --- a/teleforma/exam/templates/exam/script_detail.html +++ b/teleforma/exam/templates/exam/script_detail.html @@ -117,16 +117,22 @@ {% if not field.html_name in mark_fields %} {{ field.label_tag.as_hidden }}{{ field.as_hidden }} {% else %} - {{ field.errors }} - {{ field.label_tag }}: {{ field }} + {% if field.html_name == 'score' %} + {{ field.label_tag }}: {{ field }}/20 + {% else %} + {{ field.label_tag }}: {{ field }} + {% endif %} + {% endif %} {% endfor %}
- {% trans "Validate" %} - +
+ {% trans "Scoring" %} +
+

@@ -139,14 +145,17 @@ {{ field.label_tag.as_hidden }}{{ field.as_hidden }} {% else %} {{ field.errors }} - {{ field.label_tag }}: {{ field }} + {{ field.label_tag }}: {{ field }} {% endif %} {% endfor %}
- {% trans "Reject" %} +
+ {% trans "Reject" %} +
+

diff --git a/teleforma/exam/templates/exam/scripts.html b/teleforma/exam/templates/exam/scripts.html index 3b8b7173..e0a7130e 100644 --- a/teleforma/exam/templates/exam/scripts.html +++ b/teleforma/exam/templates/exam/scripts.html @@ -32,7 +32,7 @@ {% block module-action %}
-{% trans "New script" %} +{% trans "New script" %}
{% endblock module-action %} @@ -48,7 +48,7 @@ {% endif %} {% block answers %} -
{% trans "Scripts" %}
+
{{ title }}

{% if object_list %} {% include "exam/inc/script_list.html" %} diff --git a/teleforma/exam/views.py b/teleforma/exam/views.py index 7960decd..cd009ed1 100644 --- a/teleforma/exam/views.py +++ b/teleforma/exam/views.py @@ -24,9 +24,9 @@ class ScriptView(CourseAccessMixin, UpdateView): context['reject_fields'] = ['reject_reason' ] access = self.request.user == script.author or \ - self.request.user == script.corrector or \ - self.request.user.is_superuser or \ - self.request.user.is_staff + self.request.user == script.corrector or \ + self.request.user.is_superuser or \ + self.request.user.is_staff if not access: context['access_error'] = access_error @@ -44,8 +44,8 @@ class ScriptsView(ListView): template_name='exam/scripts.html' def get_context_data(self, **kwargs): - context = super(ScriptsView, self).get_context_data(**kwargs) - context['period'] = Period.objects.get(id=self.kwargs['period_id']) + context = super(ScriptsView, self).get_context_data(**kwargs) + context['period'] = Period.objects.get(id=self.kwargs['period_id']) return context @method_decorator(login_required) @@ -56,25 +56,40 @@ class ScriptsView(ListView): class ScriptsPendingView(ScriptsView): def get_queryset(self): - user = self.request.user - scripts = Script.objects.filter(Q(status=3, author=user) | Q(status=3, corrector__user=user)) + user = self.request.user + scripts = Script.objects.filter(Q(status=3, author=user) | Q(status=3, corrector__user=user)) return scripts + def get_context_data(self, **kwargs): + context = super(ScriptsPendingView, self).get_context_data(**kwargs) + context['title'] = ugettext('Pending scripts') + return context + class ScriptsTreatedView(ScriptsView): def get_queryset(self): - user = self.request.user - scripts = Script.objects.filter(Q(status=4, author=user) | Q(status=4, corrector__user=user)) + user = self.request.user + scripts = Script.objects.filter(Q(status=4, author=user) | Q(status=4, corrector__user=user)) return scripts + def get_context_data(self, **kwargs): + context = super(ScriptsTreatedView, self).get_context_data(**kwargs) + context['title'] = ugettext('Treated scripts') + return context + class ScriptsRejectedView(ScriptsView): def get_queryset(self): - user = self.request.user - scripts = Script.objects.filter(Q(status=0, author=user) | Q(status=0, corrector__user=user)) + user = self.request.user + scripts = Script.objects.filter(Q(status=0, author=user) | Q(status=0, corrector__user=user)) return scripts + + def get_context_data(self, **kwargs): + context = super(ScriptsRejectedView, self).get_context_data(**kwargs) + context['title'] = ugettext('Rejected scripts') + return context class ScriptCreateView(CreateView): diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo index 8459be5d..14745f68 100644 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 5d5bdddf..f51c0684 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: 2014-06-13 02:42+0200\n" +"POT-Creation-Date: 2014-06-13 02:59+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Guillaume Pellerin \n" "Language-Team: LANGUAGE \n" @@ -218,10 +218,22 @@ msgid "Script" msgstr "Copie" #: exam/models.py:214 exam/templates/exam/scripts.html:21 -#: exam/templates/exam/scripts.html:51 templates/telemeta/base.html:116 +#: templates/telemeta/base.html:116 msgid "Scripts" msgstr "Copies" +#: exam/views.py:65 +msgid "Pending scripts" +msgstr "Copies en attente" + +#: exam/views.py:78 +msgid "Treated scripts" +msgstr "Copie traitées" + +#: exam/views.py:91 +msgid "Rejected scripts" +msgstr "Copies rejetées" + #: exam/templates/exam/script_detail.html:85 #: exam/templates/exam/inc/script_list.html:15 models/core.py:503 #: templates/teleforma/course.html:50 @@ -252,12 +264,13 @@ msgid "Rejected" msgstr "Rejeté" #: exam/templates/exam/script_detail.html:96 +#: exam/templates/exam/script_detail.html:133 msgid "Scoring" msgstr "Noter" #: exam/templates/exam/script_detail.html:97 -#: exam/templates/exam/script_detail.html:132 -#: exam/templates/exam/script_detail.html:149 +#: exam/templates/exam/script_detail.html:138 +#: exam/templates/exam/script_detail.html:156 msgid "Reject" msgstr "Rejeter" @@ -269,10 +282,6 @@ msgstr "Soumise" msgid "Mark" msgstr "Note" -#: exam/templates/exam/script_detail.html:128 -msgid "Validate" -msgstr "Validée" - #: exam/templates/exam/script_form.html:25 exam/templates/exam/scripts.html:35 msgid "New script" msgstr "Nouvelle copie" @@ -291,7 +300,7 @@ msgstr "En attente" #: exam/templates/exam/scripts.html:26 msgid "Treated" -msgstr "Traîtées" +msgstr "Traitées" #: exam/templates/exam/scripts.html:56 msgid "No scripts" @@ -1441,6 +1450,9 @@ msgstr "" msgid "A new live conference has started : " msgstr "Une nouvelle conférence en direct a commencé : " +#~ msgid "Validate" +#~ msgstr "Validée" + #, fuzzy #~ msgid "Score : " #~ msgstr "Note"