From 67c0ce193f23bbf51b8cd34bb71f543be1d55ded Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Tue, 22 Jul 2014 23:20:56 +0200 Subject: [PATCH] add reject reason --- teleforma/exam/models.py | 2 + teleforma/locale/fr/LC_MESSAGES/django.mo | Bin 11776 -> 11944 bytes teleforma/locale/fr/LC_MESSAGES/django.po | 101 ++++++++++++---------- 3 files changed, 56 insertions(+), 47 deletions(-) diff --git a/teleforma/exam/models.py b/teleforma/exam/models.py index 18b444fd..0c666c6c 100644 --- a/teleforma/exam/models.py +++ b/teleforma/exam/models.py @@ -67,6 +67,8 @@ REJECT_REASON = (('unreadable', _('unreadable')), ('bad framing', _('bad framing')), ('incomplete', _('incomplete')), ('wrong course', _('wrong course')), + ('duplicate', _('duplicate')), + ('other', _('other')), ('wrong format', _('wrong format')), ('unreadable file', _('unreadable file')), ('no file', _('no file')), diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo index 117cead7feea64e0a22706f479eea5390acce275..c4577f3e60ba5d37fce56e7b330cea193033e4a3 100644 GIT binary patch delta 5324 zcmYM%33OD|9mnxY7D7k@n6S$lAV|U{U>YJ6MFd$)X@Z0$VUr~w$d(i;%LFwd5d;aK zg(4t3RMey;qF8o{5R_C>EIYDC_H!yykI?UL-hWQt@i(7)@4IuiH8LMZ9l5wD!;% z&V|w*g^cTSF%%+cXkaE_6!jzw!S1L9^hOQbA1mPyRKGD8fjOuJ&O!Bi2ep6#t1m~5 z_YrEmjTpuJu8@KT*lit3Py>~sCOU;$@g)q#a%;bZI;8t%SWR!>TBrrYqVC6=$*6I9 zp%&5?D>A=(iGmi8VK=f+6HP#^bTVooGf@l6Lk+MHtKkyVNvucpD?;_#iRyRI>PJu~ zQikex8hvWGY#nZxKcOaewY-iIScPhJ)IytBdmB{0Bn-mm?0$D^Peo0XiCH)rbu!;t z`-xhdzdD?!K`XtETKO&1gg>K>EUdP3(HMn%j$9+u{ijd^c0(O?AJj=?pvD`AJ#ivx z;X6?M51{5bTATA%;e_3|fI5-usD<6Z$M6B_s3Yol{p+Fn#i9DOLfub9P22-DQ6JO> z`dNJt>U|?nCpXqdK`YC)4!P#rsDT!tcDfYxEm>#xKSK??12y0-RKJ6$lPI(H%cu?B zFn>bL=jwVV>5HVm<93ZP1(Q$%&ovjI1}H!cyb`srk5LOMGO? zbS%d-?D{yTqVNAQ3Yzdo)K2cA7WA{#tMXS#1Jy(=AQp9W?NAHpj5_MBs0H-0`)R1p z%n;NDCZqb#K+Thj5&HhmrJw-{%oV5!)}jX7hFU-|>ch3qEJgJ@hdTOlt3N>X52^3n zuVy}udVd^h!yPbO-~VI^ny4FUg)f?^sH00qO*9zQZ!~IxiKv~;K;u*Ny&mV;E|O<4^-kHK(H{m}U3hwDtw42^QP^4^RWIGB;ZL zC#ZS0qrRrQtzO!I^ViXyqCwB_3TgrWL7m7$)C83qdM8s2)h`D1YZr^^pNN{E3+e=V zqBf9@8b1Sdf@7?G8mj+H9|cYD7HWs{QJ>lZ)KPCRi%_mMa zK8edv8#sjgKDpzllPNdvq2BNNF9oe6IM!Q06l#anQ445dwlzDW7TgOpL0>b&%tF0C z8}dg~_(ai5^Q_vA5pgJU?R{V^$zhLcYr~xyr{tD`(a!?-$#B= z+)C6Ai;<6$JBHfOJyic+Q46ga=Z)7Chf!}4$N6ibd>V9=%TRAzX>PLiBGdxEK%LND zek0WTnxQ@$zP1#GQs{vE9=j!&h1XF#Nsafu zHUm-5a0IG-8fxO%*8VQ)L$?;SkV4ePicu%9&+5le3p$OJ_5Hs^K|6bZmGBYjnN>>g zj;ao-y$NcdmKcE@Q9FGewXgxGM>herkQsJAAN9VK7=c@miQRU;JpVluG+_yb;~CVm zxrz~Z+v>ld78=~rJGyXG|0vXewNT^4T6=r5GwP^&pvLWO?P*v~-~UYO@EU66vr$L9 z0JVT67=)|MwWxtMpiW>LM&cgS0>42m=s4=+&Y@1|8tT#fY6i99{M9jxf{aE@TpzWw zrl^TpqXtSu4bTO(pl+!CJ?wr8Y60n}ewkJuff_#xHQrRz`)0J_`D>!rY0wJiTZc8M z2{)rYEQQv-A9W%nsENKuE#xff=r5qgxrZ7zthG1sV;Duf9%^CnsQYbNbN-s3BMln3 zH)@6Hs1*)HO*9(ydp{o4KNqXuVpP91SON7@`y|ozCK*oJs$$p3K*6l9=g+?}+(~PA z9#hCGR-cEPNN?bdf_lf5BU*GVWK{k># z{uaLLsNH=6-%vE*OmkK{|DzxR5EdOV*I{qZRvdK|hIkW@02WD#9&leMG@=}&YOdAPsgX6=72 zg-mM<@F|5-tNaO{B2%m`z9sX?Syi}J`(OY6qR)yx@kgv_E9wWTo7G2~tpexYoQ6Vc z6vgCkWFPsE^dY+P$q%G8IZYZ8ee&-TUF}H%i6-mG5Ym+du1E?8NGB3Ue3y86mgs8g z;f~`5@;j@a!6Y((d_eSr)Qj7B7?M2>%NhxP0zuiXmho z>1oY<@jG&nRJXR4xQBGMdKYsi_9Mf{I&zH+B(sRF4jyic*%4Qg8DzSi{~!u=h#tjm z@)FT?-NPl~3UY${o|Kcob(O;RqzySp-XOmrf$I+x&XeurJrcMMQFwl4zLOd@4O*A)-{>vCSht=`LQgty635lyBqhm@O5G=GEvJ z7Ctg(()h7256>P|u&3VFp%b&SMolT2S3e>stX-pa?UUQJEn3mAMsU%Gv7c57o|rSD Upl8Cx(BV1RQ$`gfv@EOeKe*@a%K!iX delta 5192 zcmZA43%t+u9mnzCaSo1i98rnJLAiG@PD@c1WeY_ulrEeu%%#y>S4;kfl_X1uF2tIY zVpJ!QK;9|ogo@A(8em;)jP5{twB5Pr#CxLc z`o(#Fbil!AyPG}7}{eA=cGM8viDLBA(JrocK|Ah&c6brmt{=J+gQI>l zI^hZ76m-BD=uX~`Je4H#B!zwyHlrP%@V(UfXa|kZj$5J=I}4pq*YF~ACkDjz!RSCY zpfB?nyb{M@f834(ut}rrIGJQT1y^z_I-~M9e*o=hF*<>#(5+jKPUKZ|tGA;Qcss7| zMcxQ0ZPygJEINHM_;as!>iDC!_loD7w1#a z_Os&r!Eh;h|0;BcH=zA*#XLX%J1pRv=$5^M4)7k@@DSSZ=a^j)x{}=D^y626c3gyB zKMDCSDdvy;o{R2Ocl5qqXn&Vt#?S9HabXDBa2UGfqtR!5d(_WFJD7{E=pl4~C(sG3 zL?`fUxB>0&wK(4y?nW1OusA;dhpDimDs+IaqrtJLuihjbpa8vI7wxz~*fi=}qZ8i>qe{|fE@TXX?=P1BdOFhjvDZW5ND9iD?z`5Eqp4!o&Z>NY%&^S7`Q);TR* zKzHQlBDn6l+iQI-x;7)WWGP5W+fra7na1A=+t>_MI3oFA9&<;LB@BbIN z1No5i zbVgS+2yK5OI?;)khcodyoQ)1th3@1r^uF9ysdZZM{Jn5070$33I>R=|Pj^y^PM{C+ zHJ%Jb+m(ki(0AoNtd5UH{S)X!R!9AF;d*q3H=_&Q*^2$ILE!)u&g^4!fGTtg|ADTs zuytBrj5RoK8MZ^W{7kfccXR>$u_g{icVJjJ7X6ssj=nSVG886KSc$IS^fsw&&F9m;pzp>4EW?MLfL7wvcn zy3!Ts#5SVOZWlU{594|jdS7lydS6{E;Jk6z8Xd3{88EpJ3$ZU|fB&zd;0&)vw`@4t z@FujQiD(DqQ9mbKh_+vbHSx))e+K!5PF{@byU_{nL*JdlScqR@H9!B~TELukX-9eJ z%4?%5Yl=>!9lC{QqdU?aeJ2KnSEKF9!cpje6VU}tMkhKQ?dM+1e*Pbz-~<+-H!O(; zkE1)Y8Xag&oUca*+KhI%1HEq-I?x_;f`{VzQFOqZ_UXG(fZo@*J?UnUOX2|hv?SLMzs#nQ|31#-h3;e==}kO*H-4Bc@mqm|iL1Ld>inkk-w5}|xnJ3TB!16$+($-a zOMd=1enR{=`W!Nf@VJtBQL=|TP97$^$XVq0G2wV2yb~9Y z&7>O{Ncu2-GMD%(=hv;rtz>DolqA0i7lyJj%FkjM8AN_b3Q1q`DOpcEdJ?~kx)A>D znf#vog8YkrLvuoeasA_`f22gzP5+$aHd$3?m*-q$E8;sYmvb;hu1; zCZCXXp8U_j{&%3_1#%NPOsbRHh(|t|O>)T{q&|6$%qJezQj(3~li}+)gu=5NkO%motl+)>{?n{(Y#sx U+=@QU7w6BbDmhS5*{(9@J9dNGH~;_u diff --git a/teleforma/locale/fr/LC_MESSAGES/django.po b/teleforma/locale/fr/LC_MESSAGES/django.po index 8c1f6da9..767069f2 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-07-21 20:22+0200\n" +"POT-Creation-Date: 2014-07-22 23:20+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Guillaume Pellerin \n" "Language-Team: LANGUAGE \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" -#: exam/models.py:62 exam/models.py:393 +#: exam/models.py:62 exam/models.py:395 msgid "rejected" msgstr "rejetée" @@ -32,7 +32,7 @@ msgstr "soumise" msgid "pending" msgstr "en attente" -#: exam/models.py:63 exam/models.py:378 +#: exam/models.py:63 exam/models.py:380 msgid "marked" msgstr "corrigée" @@ -61,164 +61,172 @@ msgid "wrong course" msgstr "mauvaise matière" #: exam/models.py:70 +msgid "duplicate" +msgstr "doublon" + +#: exam/models.py:71 +msgid "other" +msgstr "autre" + +#: exam/models.py:72 msgid "wrong format" msgstr "mauvais format" -#: exam/models.py:71 +#: exam/models.py:73 msgid "unreadable file" msgstr "fichier illisible" -#: exam/models.py:72 +#: exam/models.py:74 msgid "no file" msgstr "pas de fichier" -#: exam/models.py:116 exam/models.py:190 models/core.py:198 models/core.py:252 +#: exam/models.py:118 exam/models.py:192 models/core.py:198 models/core.py:252 #: models/core.py:492 models/core.py:579 models/pro.py:45 msgid "course" msgstr "matière" -#: exam/models.py:117 exam/models.py:197 +#: exam/models.py:119 exam/models.py:199 msgid "corrector" msgstr "correcteur" -#: exam/models.py:118 exam/models.py:191 models/ae.py:47 models/core.py:111 +#: exam/models.py:120 exam/models.py:193 models/ae.py:47 models/core.py:111 #: models/core.py:136 models/core.py:250 models/core.py:497 models/core.py:542 #: models/core.py:583 models/crfpa.py:64 msgid "period" msgstr "période" -#: exam/models.py:120 +#: exam/models.py:122 msgid "value" msgstr "valeur" -#: exam/models.py:121 +#: exam/models.py:123 msgid "date start" msgstr "date de début" -#: exam/models.py:122 +#: exam/models.py:124 msgid "date end" msgstr "date de fin" -#: exam/models.py:125 +#: exam/models.py:127 msgid "Quota" msgstr "" -#: exam/models.py:126 +#: exam/models.py:128 msgid "Quotas" msgstr "" -#: exam/models.py:146 models/core.py:458 models/pro.py:67 +#: exam/models.py:148 models/core.py:458 models/pro.py:67 msgid "date added" msgstr "date d'ajout" -#: exam/models.py:147 models/core.py:159 models/core.py:459 models/pro.py:68 +#: exam/models.py:149 models/core.py:159 models/core.py:459 models/pro.py:68 msgid "date modified" msgstr "date de modification" -#: exam/models.py:148 +#: exam/models.py:150 msgid "UUID" msgstr "" -#: exam/models.py:149 +#: exam/models.py:151 msgid "MIME type" msgstr "Type MIME" -#: exam/models.py:150 +#: exam/models.py:152 msgid "sha1" msgstr "" -#: exam/models.py:166 +#: exam/models.py:168 msgid "script" msgstr "copie" -#: exam/models.py:167 +#: exam/models.py:169 msgid "Page file" msgstr "Fichier de page" -#: exam/models.py:168 +#: exam/models.py:170 msgid "Image file" msgstr "Fichier image" -#: exam/models.py:169 models/pro.py:49 models/pro.py:85 +#: exam/models.py:171 models/pro.py:49 models/pro.py:85 msgid "rank" msgstr "rang" -#: exam/models.py:172 +#: exam/models.py:174 msgid "Page" msgstr "Page" -#: exam/models.py:173 +#: exam/models.py:175 msgid "Pages" msgstr "Pages" -#: exam/models.py:178 models/core.py:93 models/core.py:106 models/core.py:128 +#: exam/models.py:180 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 #: models/crfpa.py:63 msgid "name" msgstr "nom" -#: exam/models.py:181 +#: exam/models.py:183 msgid "ScriptType" msgstr "Type de copie" -#: exam/models.py:182 +#: exam/models.py:184 msgid "ScriptTypes" msgstr "Types de copies" -#: exam/models.py:193 models/core.py:256 models/core.py:501 +#: exam/models.py:195 models/core.py:256 models/core.py:501 msgid "session" msgstr "séance" -#: exam/models.py:195 models/core.py:389 models/core.py:499 models/core.py:587 +#: exam/models.py:197 models/core.py:389 models/core.py:499 models/core.py:587 msgid "type" msgstr "type" -#: exam/models.py:196 +#: exam/models.py:198 msgid "author" msgstr "auteur" -#: exam/models.py:198 +#: exam/models.py:200 msgid "PDF file" msgstr "Fichier PDF" -#: exam/models.py:199 +#: exam/models.py:201 msgid "Box UUID" msgstr "" -#: exam/models.py:200 +#: exam/models.py:202 msgid "score" msgstr "note" -#: exam/models.py:201 models/pro.py:125 +#: exam/models.py:203 models/pro.py:125 msgid "comments" msgstr "commentaires" -#: exam/models.py:202 models/core.py:265 models/pro.py:48 models/pro.py:88 +#: exam/models.py:204 models/core.py:265 models/pro.py:48 models/pro.py:88 #: models/pro.py:104 msgid "status" msgstr "status" -#: exam/models.py:203 +#: exam/models.py:205 msgid "reason" msgstr "raison" -#: exam/models.py:204 +#: exam/models.py:206 msgid "date submitted" msgstr "date de soumission" -#: exam/models.py:205 +#: exam/models.py:207 msgid "date marked" msgstr "date de correction" -#: exam/models.py:206 +#: exam/models.py:208 msgid "date rejected" msgstr "date de rejet" -#: exam/models.py:207 +#: exam/models.py:209 msgid "URL" msgstr "" -#: exam/models.py:211 exam/templates/exam/inc/script_list.html:14 +#: exam/models.py:213 exam/templates/exam/inc/script_list.html:14 #: templates/teleforma/course.html:50 #: templates/teleforma/course_conference.html:40 #: templates/teleforma/course_conference.html:71 @@ -231,11 +239,11 @@ msgstr "" msgid "Session" msgstr "Séance" -#: exam/models.py:219 exam/models.py:377 exam/models.py:392 +#: exam/models.py:221 exam/models.py:379 exam/models.py:394 msgid "Script" msgstr "Copie" -#: exam/models.py:220 exam/templates/exam/scripts.html:21 +#: exam/models.py:222 exam/templates/exam/scripts.html:21 #: templates/telemeta/base.html:116 templates/telemeta/base.html.py:121 msgid "Scripts" msgstr "Copies" @@ -311,15 +319,15 @@ msgstr "Note" msgid "Send" msgstr "Envoyer" -#: exam/templates/exam/script_form.html:28 exam/templates/exam/scripts.html:35 +#: exam/templates/exam/script_form.html:30 exam/templates/exam/scripts.html:35 msgid "New script" msgstr "Nouvelle copie" -#: exam/templates/exam/script_form.html:31 +#: exam/templates/exam/script_form.html:33 msgid "Blank script" msgstr "Copie vierge" -#: exam/templates/exam/script_form.html:59 +#: exam/templates/exam/script_form.html:63 msgid "Submit" msgstr "Soumettre" @@ -1395,7 +1403,6 @@ msgid "WiFi password" msgstr "" #: templates/telemeta/profile_detail.html:84 -#, fuzzy msgid "Expiration date" msgstr "Date d'expiration" -- 2.39.5