From d7b4233282f506c90e72780475f9e2a5c2df45c2 Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Sun, 31 Mar 2024 21:45:28 +0200 Subject: [PATCH] Rapporteure -> Rapportrice Signed-off-by: Emmy D'Anello --- locale/fr/LC_MESSAGES/django.po | 18 +++++++++--------- participation/models.py | 2 +- participation/views.py | 2 +- tfjm/static/Fiche_synthèse.pdf | Bin 78118 -> 78118 bytes tfjm/static/Fiche_synthèse.tex | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 83e325b..9872655 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -469,7 +469,7 @@ msgstr "opposant⋅e" #: participation/admin.py:132 participation/models.py:1360 #: participation/models.py:1571 msgid "reporter" -msgstr "rapporteur⋅e" +msgstr "rapporteur⋅rice" #: participation/admin.py:187 participation/models.py:1521 msgid "problem" @@ -1090,27 +1090,27 @@ msgstr "jury" #: participation/models.py:1612 msgid "defender writing note" -msgstr "note d'écrit de la défense" +msgstr "note d'écrit défenseur⋅se" #: participation/models.py:1618 msgid "defender oral note" -msgstr "note d'oral de la défense" +msgstr "note d'oral défenseur⋅se" #: participation/models.py:1624 msgid "opponent writing note" -msgstr "note d'écrit de l'opposition" +msgstr "note d'écrit opposant⋅e" #: participation/models.py:1630 msgid "opponent oral note" -msgstr "note d'oral de l'opposition" +msgstr "note d'oral opposant⋅e" #: participation/models.py:1636 msgid "reporter writing note" -msgstr "note d'écrit du rapportage" +msgstr "note d'écrit rapporteur⋅rice" #: participation/models.py:1642 msgid "reporter oral note" -msgstr "note d'oral du rapportage" +msgstr "note d'oral du rapporteur⋅rice" #: participation/models.py:1648 msgid "observer note" @@ -1302,7 +1302,7 @@ msgstr "Opposant⋅e :" #: participation/templates/participation/passage_detail.html:25 msgid "Reporter:" -msgstr "Rapporteur⋅e :" +msgstr "Rapporteur⋅rice :" #: participation/templates/participation/passage_detail.html:29 msgid "Observer:" @@ -1366,7 +1366,7 @@ msgstr "Moyenne de l'oral de l'équipe rapportrice" #: participation/templates/participation/passage_detail.html:111 msgid "Average points for the observer oral" -msgstr "Moyenne de l'oral de l'observateur⋅rice" +msgstr "Moyenne de l'oral de l'équipe observatrice" #: participation/templates/participation/passage_detail.html:122 msgid "Defender points" diff --git a/participation/models.py b/participation/models.py index 107aabb..2838dd9 100644 --- a/participation/models.py +++ b/participation/models.py @@ -928,7 +928,7 @@ class Pool(models.Model): header = [ sum(([f"Problème {passage.solution_number}"] + (passage_width - 1) * [""] for passage in passages), start=["Problème", ""]), - sum((["Défenseur⋅se", "", "Opposant⋅e", "", "Rapporteur⋅e", ""] + sum((["Défenseur⋅se", "", "Opposant⋅e", "", "Rapporteur⋅rice", ""] + (["Observateur⋅rice"] if pool_size == 4 else []) for _passage in passages), start=["Rôle", ""]), sum((["Écrit (/20)", "Oral (/20)", "Écrit (/10)", "Oral (/10)", "Écrit (/10)", "Oral (/10)"] diff --git a/participation/views.py b/participation/views.py index 1074805..0100366 100644 --- a/participation/views.py +++ b/participation/views.py @@ -1431,7 +1431,7 @@ class PoolNotesTemplateView(VolunteerMixin, DetailView): reporter_tc = TableCell(valuetype="string", stylename=title_style_right if pool_size != 4 else title_style) - reporter_tc.addElement(P(text="Rapporteur⋅e")) + reporter_tc.addElement(P(text="Rapporteur⋅rice")) reporter_tc.setAttribute('numbercolumnsspanned', "2") header_role.addElement(reporter_tc) header_role.addElement(CoveredTableCell()) diff --git a/tfjm/static/Fiche_synthèse.pdf b/tfjm/static/Fiche_synthèse.pdf index ada58a04f402a645e92a9c2f3679d27c9d656a3e..f4f27c52e2dbb36ef969dd7197d6b3511788c6de 100644 GIT binary patch delta 2187 zcmaixdpy$%AIFnRLz-Ewh0HBeF?MlTp<-L=5wXK#F2mH~$sE^}ieH%PM#m{3w}YD7 zVL7g4Q6zGSC6j9|ISZlG!eM&!^qlAQ{P8@m^T+p(@Av)vem~y}cS?pkCG!*Q=t17k zB`Op!)v1mwd-FbPH=S;ZQ<1TCI9k+kjN*Z!2z-FC`>vV4!d zh^6rz2|Ky;i5*&d{7zXja@KrIMKCUP&_P6Rfym`$(}0lHL>RZv3Cb;;9+cy8>p?mBAeS z`F3BZg&EB#0bVmq_2o@_!abR4^{h}>w`6r)sCI4DB5bVb3-`2UXQy}F`|d>}!#j*; z-SlBVMWMQ-`)Lcr*EB&H8l$v8bsmZQOvlwq2JIZ(7F(`5R!)6%?tT=FRG(}a8TOYD zO5x8@&p-nxr9URMNGnYW8s#U$()E%p9ae18StB+h21RAJV{@&qD>l6RNwljDmhme-)Y*D>>H{~+i^U%izK1g@t<>xF#-e8H_FRQt-%!}u}*)9UeQh#S& zynYEg%*QLDRv~}R(_I5upK!s zAO(8Soux7F5%z0Lbe&_1=c^Kt170<0_Y`PPPf(cMn{%XHb{vudZp+lS?53*p0U($< zg>hT8ZZB;uX!Fypfv2!wMQMH7IE)*M1Xd(2ws${Su$k+Uin0XqMYEl3k+#vxg=`#Ss}s{7bl!r_s=5TC|Fre%p4L_Pi0$6$QLOznA#!2PTNU1)2r zBj)OZWMpQ{k0%3@@o`2=mR4^~rt^m3>>|7Pi^y zZjH;`}iFSmthr9G$Nv?&~d_SQ1z&>9Pl5B@EfxWxop%#B0%*P?$i!rAch z>oA?PzCzq~w_60lw_`bK^!%WFo^KFS>Q1ZyC2?Ry5CKj1`%^yp-RSK39}M{RvHu6Z zGw$+x%y_>O`*TW%TvI#z)ZMBF$tEJK%&+2>i$_7_Sf04fY>%vCq<9go4lk}b={EC%? z585Ubi`ibn;CBtPU7mnh$SiWxqrMt1`3WN z#C(gA?lqCcTXON*3LPllFIGPR4|(FzF61wa4hfX9DDKrc%b-$Aj5?b zL>HHeD`tRkwWjusPzy35UZ>Gw)v`A065?LdqUkeWFK!<)cEOd9$6=*ixN<#mZU58> z`0MDQwK6Dc*WX2Xa@W;VOtvo`x^-67Z2Z!ARM6v&SMja(f!r+BD5cc|GKu>owNk_C zh9za&mqX=&CdX4OD4N#>n^k(>MS=a*jTxG%w@_aJB?Lz-R6C*4oX(f|WqiQ9_Q<-YRNde1^~{J)uwJqr zt`>K%h@*x~!CoO7&cnUw^Bah~3lEP}n{RaB>>YlljIOCYu1zv|-i@xxdvOiV3(Nrw zcnz|^JL|}<@?%!Ki7u0>kmQ;vPjxF~`BO2aO+WaV{Y~f1Q&u{a_T>k;_Wt6qxx>qI zrqZNO$uAcXUw@1cCy3IQGNXrzZ4Ky#vr%du`IP0kZrZ3acStv@&72VMM`Sp@S}*Ge zUD)v|13OQWeun8fMlWxk8ThKj%Zw?yqsxPo=(?4KMu^{@inu=ulrwUzV%tIW?I0|tX}Ml@0i{@;Q6yGSV#$OeNW8k=MB<|mA;@kBI^h(_aWu-0ZoGYrAn Tm}GOpO4H)6QZfvUrPlrlXi*sr delta 2187 zcmb7CdpHyNA8rR(SlL8NGL3M^%r)w;!4JGXpE5D zMPiuSTtbo!GZMMvx6XOa^Yq{E`TgnR*SUYji^G@bMF;wt@9Yv`iY2I5M(r}q|Yr#3~Pt0QvaLWFfe0baZQ7N5hf0Xk|j#<-5a97~PMRye?Afb^zu(9(!8? zs}mP}UyQDltMB?Iv#VO9kGoOkqb%nkS^axF=@5pFj7iNvN(-%(jBS_aM1FsyI;%qn zcJXZ;y(qgC1GT(ZB!}4jTLEshhvx9rL>LxP%qUX4y+5zEXk-bu-6c`gs+ISGN3)6> zjjNZt+2eJKQhzUq;BV|b3i;qdT$_fS<1J0DApJK-YSbcC)uY+vel@6yFO>)VG70}7 zsXB{vHaCK&^<(!-MS-^69oXUVc>jv+Zmg~AV&g5_k}1B!i#ih}xyi=O5yH0lbLewK zE0Bc%ZA>EYYj4EBMHc=k%6E-y*344KY_o9h{KC}e6w^O}RlR3s_om9EeF{<8*STvF zNkqi;mqC0>dq_VlLYAG98#8FLT$8_Ar_q+nCtmsZoLc6XIl^fSGx^aMyT@DV5potaPJyvd7gr zKFNR%B_)sro;^5Sh$|U`q4s?7u(h7-krfMu?){nLrzccE$xUR!bwi!2n!^(wbOhGa zss4@rDr|R_C>wB(O%-P^;PUnPxe2QY6Ef;-{IgR`8QYf-DMi)&!Oo+O1w-yn2A&R=RFipTF1Xi zCR|BdP=Pr$(b5wvdr(6;&q!@QsYd?Nw_>;p*<6{*jJvD_p&T<+OlmQwTg-5LYL7(? zGwynVAqNFr))|mcsbS=1Q^h4eC{I^6UMuElJ{DYpha8ZVk=k6Vwh16uhTD9j@q*~ zFC8{!+motibU95b38-xPR@bS|pt7NkgBfRwzV-BT1G+De0^d()Rje^yRnKH+%=9wQ zCE?dTd0)@soUb>&p}E@!hHz))C&{}@9XiR_v_*|0cE1`4Tu58`(c{?Vp_*Je8&x#~ z*aW}_0{QlmY^NU|JMf3c2R6-u6Ehswx-_{4{-n{>nUX`*U+7rggU>|56>1A=S5 z*)D6QvW)AnMiczI(}4;l`N7he0hyA`ug4@*s=Nvdir*c`xZu${aJ=5D(ak%e&L=!- z!7Se^9N32U6BUM=A61a(#83RW)%Kbwv}eL_-)cYM$E#r&XD2e*Z>IcVDQ7z(=&N#8 z!UCzBh#M>kGuXPSQas)nI5=+?M1~=dnR!6*J5|)dbT4iZ@l}1a8Ry!Yl5So1z zsKROLJTG@xd6);YNt(wjas$#Vk;_3S3H%aV?D{1JF)IYtGj{58)Tbu%FkX=K`f6z0 zk@V`%cO6-UxpPe}ue)J@NI`IT-yHXM3yp7W8`j~@?D-gwPU z-#OoVIZGn-5;#N~f-ziqb{wKJ`NzTM>{leuL^ zEMh$uWF@E9%_)XGJI>Y=zs5f{M)JmRjw%mPstU+^!Xra-h9~ZM?6IUFvbKJoekA;t zasS7P(B+!nj-{Q>T?rL+(6}^}_dqfrhDcYZHB4KYpm}b8O{DLUV!^%)w!odTh%&I_@ep&mcR(xU~46H*2x~C!Lkcj z{cMoIF&i7*24u7W0j2Wd+Pd0Eq=BBHI#MewQUw706<|D80bqb;NVFbWPaAEZ muZJ`>H8Di%YwPP6>Y;VbO?3>=dPrSkg+KlmB~1ef`2JtWts;~F diff --git a/tfjm/static/Fiche_synthèse.tex b/tfjm/static/Fiche_synthèse.tex index 3881f83..a089feb 100644 --- a/tfjm/static/Fiche_synthèse.tex +++ b/tfjm/static/Fiche_synthèse.tex @@ -53,7 +53,7 @@ Problème \underline{~~~~} défendu par l'équipe \underline{~~~~~~~~~~~~~~~~~~~ \medskip -Synthèse par l'équipe \underline{~~~~~~~~~~~~~~~~~~~~~~~~~~~~} dans le rôle de : ~ $\square$ Opposante ~ $\square$ Rapporteure +Synthèse par l'équipe \underline{~~~~~~~~~~~~~~~~~~~~~~~~~~~~} dans le rôle de : ~ $\square$ Opposante ~ $\square$ Rapportrice \section*{\'Evaluation question par question de la solution}