From 131430779aa8325ef6f54c614f8afb116ce160b2 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Fri, 13 Jun 2014 02:59:13 +0200 Subject: [PATCH] locales --- .../exam/templates/exam/script_detail.html | 21 +++++++--- teleforma/exam/templates/exam/scripts.html | 4 +- teleforma/exam/views.py | 37 ++++++++++++------ teleforma/locale/fr/LC_MESSAGES/django.mo | Bin 10278 -> 10391 bytes teleforma/locale/fr/LC_MESSAGES/django.po | 30 +++++++++----- 5 files changed, 64 insertions(+), 28 deletions(-) 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 8459be5df0bfc06309154bee70977f938c6f536f..14745f68d7192f6ca7bf079f18a941fe49888cd7 100644 GIT binary patch delta 4787 zcmYk;32;@_9mnyL1(Ik7Fl5sxvbBgo_L#P4f)Jx%j1fp4_^6VQ1dD<`jN(E7 zu}?7~Q38m7vIZq8ix3t?ij*pgHZpWNDr%gzP8~+<==b;T|2f{_$LE}L?>*bS_rbae z&rb||mK6P*<2XZlk$-h{E+@jd*So3JxzS0^U4mmU4vTO&-j3NAwDWD)gL*s0;3=dl zch>ye+B>le?f*mi4Y-RGenUf7?$($+FdF-!2F^uwI0$1gA9dYWyc8#(CRUERemd&< z*{BITVD$y4exF2Lw*PoQRY4%Oa?y6}69#E2B{d^D;(5p`WUYUSBh?`IA{ zO?)J3Vg;yiicvdKp2Gg~_}w%b7{kr63l^a|d;zt^EvOZ5Lv^?p$Ke6ggyU1a>wBUG z$~5~~`*oSy2A$G^{sqDYDbP5f+akgDJ&n|30oo_@9yb?9B7SswhSbYm>fSp#~ zV;(}S_!#OX@38i-Q1|~gKtVTNKwbC~YQ^zsUV9(Z#B$65s1@g@+ENAz^AH}y*~^!?{iPzU`{Hw;5{Faou8H=?$-2=y$>t=*5hZZ>M- zb5R35j+)3~b2+M?RaRebZpYB~zl(xaco5am5!A|0Tl+aw$DgAH{07zGcjiTFk4pCj zz6ABvBwIZPwPOQNk75|A|8eO&f33WP1`SYw+JP#&a0c>g>h4F~un4uXAZo(RsE$`# zeUqKvj_Pk0>i1>8o&Ojg;UBk8Q2mwn=J~7O!Wq;+-=Ze=1L~1PT;V<9B-H(Z3<`RyuSVU_ANA8X47K7S)PSYdei!Ox zthVz3)Wn`Zy*rDoeFduD)z-caHIW_G{*G4S~#J)v!{2gk?qWXHzI0gCCT{>zZLy$jiJb!7zHK^<7VKU>pB^1=*YMg?vq6Ui1 z^tLP+bz{1jYwd$j6TBWZ!O_UCwz~;6foaH#?&hPeYcf}%-i7rT&|CSIo!E<-$YE6b zQS$`q*_}pB^>(+>pqFKz zoj8dasKeSjQ7=tojyFJe)Pz$}E6lX|0MtZoKuw?+yWnKhI2EX^pMhG?+<={EKy}oJ z>bMED!nLT0?L@u3M^O{`#Lk~b-S;EvzPMa(;1n|hHQ+U<0f(cm`#tIr1WG7qi^}YR z3e?Q+LETtq?T?vDQP(%2I#_A#Yq1yg&366+)Ic9%Bz|gshPv+@vcP~lPa(7d)WC69 zdRvu@T6u4b#=)rbL(Q?+m3lF1Wu+K{6{xMAj=HZJwUBy@!G+ibmteHM|DZKAp$2#f zV{ij%fNiJ&+E5ePk1==(HPBhqGyl@se?YA~@+xnjc+?Igqb8Du>gOtq)Av7uf(HHr zYQ`lxfs;@jO~n|z4>h4VsDBmbTYVWuQ2!IDCOZC1GDthoai51PK>a4XL-gOf;DK(* z{%I6elko8jg>j_V8uTl+glH0(YjetbQDy4UUQLp%uG3$Qkk% zGL!I&7djgGdl=d4Rb3^1Xyp=YBKqH{e%|Jj*+f4WQRIE1<2mvXxt+9-okYh$!lx4& zKh#je-`mJ2GL(!ar${N$5lJ?a0jhAkLGC1ac;RDxxL`hSzJ}Au1oEo2y?_(Lf=^a}C z732e}&%@=%Zyn z=|`R-GstgAKFK0uNga8KJVbPCAgzS|f`yKUgUyNQfdTT*z;aY2a1#_*eFZEq3-)0u# zZZeB>Cm)jqWDyxoa)_SK0rDVOM=Hn>az6=@$H|T4J@SM;kQ*r6O?1p5M@cL>LBhvj z3XhQ~WFtu;I_@HWCq2nvGKgGFbUZ*-lIGUSll)QfzFAfNSu--~Dr@~U^>x7oDgQ|D z&Gc2)`>K9vD@#3M5XP|?zgO_RnYqlwA3W=+%Ts7}(%L_7U{_x*35nV-)&=Q+wyx1^e z+wk6LR}gv&^iBwDXhk5PMm`d*br-BGqhh@tb^Uqh4n%E4@Ucs zKo>A3>J!m%r=k63VLj$g7Ey4Z<A_vCjNSJ_QFZKnE&BC+>_cq$j%azSsZIANQdvJBGHGp&id*bu5qbm!kbD+V4yB&Qp2WdfhM&U3e>W zVMXXXUC|xslgIw^xRU`iFh(*uI?O-^d2vV*TU=3p3^kD z1NG5`=3zr@h3;gxrtH5L-X0x?M#qupgyYZ&CZa2z7WLWa)-H(p((oDd4p*Ts^()c7 z9ld@pdfk4s-;p#0U!t-&@iDrfOW{AzJN*LPp;Uf$pk`>l*60E|p%Zow`=WO|G#rKA z(0%B5lhJoBJ)6Qk6duLz;wf~ct-g|7X)!W)(mCn_&;f>^3m=WXBU8``=Aa9jk1k+o zoL`PU>NV)Xw<7)1$!-d6Nhvz;L3Dr<;k#J*5~2f^qy0Wb-;K}1RI_ZqM(EbIjCvQe zfA6Rd42NOm_dkY$cRUrHU>15O3(zfk99=*<&aXfR%%FGjDtZIk(XV6=I$mjVE&%C^*1p=$&6jw>H&0`%Igl?QPJ0ozOe)hECKMUC5wt7~22ds80-M zpf@-VUC2^QJJ7N?u{ut?gbutJop38U;Lfl#+7F=0KLZ_b9{Q3kj`OSVDgH8B zi;mZX=b$aozr@xY_v~6 z7cw*2=SF=Y`g`&Oa(y~kPk~Q3DM1H*3w?&i&=sFSC%%a8P(`%=6J5ZUQNN)uyAzGk z1$RWx--2%SV03|_qdo@fGJi6Sf)mb1CwdN@cs063FQW_Fh7PE@N~4F$I2Z*7gmA%N+(y*iEFh@ z5?=76E!wYdI2c{vu&9qh7cf5BCt=zSQz^KBS?B`hp*xaB?{qCX@K&_nuCNq+c@Luf zPofLFfcC$H?%?0UFVL?mRg_&=^CI@&2@7e^&gekB!XfAa#-m@sZ1fHmqWza(4SW{w z$CWq=|AsEKe{uG@JJCll9BrS1KFXQJ?7t_L(BMn522=PNy7Jf2JKP)fBj|!op$qs3 z-NDP~0X`j&uMS#ojn!~EnMFF0 zWIib*$B4(nS(1V1*MESF%#_#5pFWY&YozLUk-`vicQp7TwUW35zQ|+-sXDx!s$&a< zVO15}PktEncX4fIQvJs1$0*%P&Xd(-8fim3o+sZRhpli-B4w2&b{&62zDN8OTTH%B z{DJUwd!Kk@vLvJNRq~6dA4k3v-i!RE#+!#KJo1*-i@F#ebyhP>@UcIC* z@xArfN8Ta_t#GW$^8Y_Ga~jmT;{mF_CSAz0WD4m)ZY4!z0C|MGLLMg`KP7t!|5BrEKak~Q9LXo=h=-rpcL@J-sd@~Q`2TL@pZv=YZzsK?ekS}D zt{~mWUD37!cRS2Y6uL%Z3AT@N4jzf}sPGOvL}rqP8*{X*U0S4yO7z`^lWBXesRvEnbRMfG_SNIKa;B7^XAf93I^6JUDc*VwakIG YpHx4-JF}yxU#@+QZ=X_nxoA)7f9V~hi~s-t 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" -- 2.39.5