From a952037ebab65746eaa6a016e4d6232226efd22b Mon Sep 17 00:00:00 2001 From: numahell Date: Wed, 19 Oct 2016 00:04:04 +0200 Subject: [PATCH] Translation and minor on talk detail --- locale/fr/LC_MESSAGES/django.mo | Bin 11778 -> 11605 bytes locale/fr/LC_MESSAGES/django.po | 188 ++++++++++-------- .../templates/proposals/talk_detail.html | 33 +-- 3 files changed, 126 insertions(+), 95 deletions(-) diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo index 0f1c239b516233757785d8a01204f90d74965cde..ab9d1a75453842acdda5fef95fc1bf1881cff813 100644 GIT binary patch delta 4035 zcmYk;3s6*50LJmNJXT~eTR{;MT|p2M6x4{!(zFCkjnE!GCG}V54>R8J+uu27@4e^TbIx5{HtX<= z;P*XZS`0@U=}Xqf8gou%4<8&yE;FVl9>q93hY5HQ6EU`Xq&)>wsHdUMABFK)in>*q zHGo`d8u1!qg60tl^l9G5O#B!J;Ti0TiI*GW#Z+|TP~;8Jy)q7UquHn> ztV7M@5?gOV4e&A4K%PNO{Tf@}n#BBTq`PR~-o~+hikiA()|03yJ&#cs%?{HhbMwKf zn7-H>b1}RptR<)ioPiohrERZ84PPnvogSa@6%zn2z@aDQLHDK#i~!)$yCC8Tk-(qrni>cH%;XwQV^+d-}Gjq=B zVZPPzARLOhI0VZu8=u5{d>eJ%DO5jaZT&)|9yEVZ&=f^6Je?4ay1;Ae$*4`%4+mf# zYRyYgPf&rH!3C%%UTW(rP}i+S{+S)tcGPv>;ds6OCn$`dA-7NDH7m!F)ORAwYffP_ z{)@UWifPa$^q@Mp40)4`&$bUoJx~E^>8?jT&_vYrCHDL2n5p-F4h5~z0E3Mm6Px3RWqYJ2|>c)=&Z=^{=?U8KMlaD~1KMFN7#i;9MB3+q!)WBBtXa05K zYc$BWQ3Lo0HL!!$W5@9`)XWPhLroI*tdPRA@9hU#!8>b{kz0o9-e z(1aT3>L3Lk%4|bT<$im@w>X&kZ>ZNWm0yb@9EibaVx1gSA4e9~f?DzXo z9e1Ff^en2Mzir)<8LkIS3I&~zh3cpPV{ts{hh!4!MvGA+Z$=I5X=L`z4%C1SpsqWK zSL3g!`(_M^I2_&7Z$K?sF(&H$FQuRx%|lJ$Oo^Vi!zBZNd!X;Y}g3dgd<7qkprELL54%8@!9UupRYh_5kMMDb$U6F)bQU zwsiu=Q4ipCScgT}hMI|sI1KZyj105_b^ibc)!`!BumrnOZ?g53*5^Ida_)EdXJbG6%(Q8Si>+9QRi``==}pFY^W|5Y@M;)}&tf)0+wm>gp!V-e~G zEf|Hbqi(btwF&p4Hs5>JuhB#Or1iY@Kh#orm`;7~&1L?>Yea)ao?*WjfodOvF<5Nt zlhH+8gQ+B$M8`C;jp(T#B|3^Dmd?8qlUap9wXIcD49UCnbXLVWH`|=n!HZRiI!Bq6?%)btl=x~he>2Bd5Y*S)FULD zbRK0Cc9VV~Z$e_Q)HW9)Ti(pIb-g1|WT35!SICk}>Rl-hA|Bhe5%qHF$S3QkauqHl+WH|flIVyf`XyOJ?jZUV z(MoM5cd9go!T_Sbh59XAP3|SPlMUo~(s}qORFEkok#rslDBMC;k*7%!*+t^Xwd7TD zGnq$jAlr$K#d&-bkekSJ^Dk<`m^^>n$MuDxnpZoh9~O`Si~n7kskVNOG1z0Y4`MT>rd4wSR8tlPeB(DfA5+HZm{YS<^Si<$RUujqWzJv9`7@ zu+U%UtMJ!{e)Q!#{RcF=oYu61QL&Tg(jQu!k>+g480~USXMXC6yS*k*=c`@N7}}k+ k$vstlHaJz;Ke$3u2Y=?I=d`HLYTw-U9dsH9?a96Qf0qZ40ssI2 delta 4205 zcmZwJeQ;FO9mesqn=DC42rPtP0wIf#5KMp&Xw=mr1tkz(3j`@hA;E|tV8~_zZ7Hl^ z05xKT6)=_}s6|7;7Zx4uP@EbR>&pyi<4cD^p;JaF9gEem)iTrXll#j*ZSUmS&%I~w zz2|q&Id`FR;ifxcXZt4abZjq?LF7chxhuFboe#Fs-p=*MF_?-Kn1-`40~caHTyEd5 z!yJxVP}l9no_G{>%h$|zFw?o1`-q(z`Qjqdw+r=gt`G}xIL<(I*o;ApVGrDnT;d+H z@1M2yBd88v#a?&92f7cU@x?khfe(!cA$T~%2SQ!o#y%oUj9P){@ovv4tLBqErN z>&zXf>)KHrzJj{%Td0xxJ@V(y^P%(pfywmm{FJ4RQ&3OV8^>Ta7U2{u!A7jay{IAo z40YXA)O7(GRagcN#{PCZ4wE_lE@~tvTKja2sj@0|R9Ow`IEwtajeO`vJ28Yuu^c<` zUd&)P@^Kq#?Hoqk=WWzfo-r?=3i}jQz!me`EXH4R6=0?4i$17IbCEt=zBv{(lojS& z)DSO0KQx45jsE~{171R^_8#T0kCVC*I zp>9xsDyR%q$avJ8&P1)1#i;Ao;tjYSb^n)9*ZmeXb??P&rxSI9KjKilj9R^Y26&YY zMs++KH8SH+H=1JY^H2{`jT*svQ~|5)cn#|Q>+o895LIaGFgqpeoJ0-Dm#7`tQ3dWs-dNYJcD?_{*wGWdhU)Mn z>caP|{X;C|_$+Gf0=#RQ<05k;>ijZX;bTfrg&bg>)P4*#MQ@-U@Dwt;?h?jyf}fW> zgz3oixDr&Qx0$!27F```=+@%`di7#(Apus97E2IyqkPosSB@%pk~z(sixX&HgjySWa1NfvAK)qkL_1W|<*A%o(|QA0Z4zOTn(jyIuR&*!iL zKfn$gNaH9xhg!6;%mQz*Ohpa(64aBfHCs?~wcXr zUl_nNR?#2Dq%Ek9cG&TLJAU4dkE1$z7uC@j)W}`H z5qJr8zpUZjgA73xSb{_7-&L@q%IZ)z*o@a>E2@AF^ECG0_#A5PE~4Iwza!J^l9@lf zc7>=8Z$^#ORMb>ep$ctAyu#MMr0qB;m4?g z(^+ZiAc*QX$Bsjo#&MAymziN}pNQ&bdNJd#A*-T61=OSFrWG}`2T*hWYt&otJJb;V z0rfUqLUrUT@xD(-6*36ZaVXx5qj5H_#EJMDoPlm6W( zGotCbpJ=;6B$;^F3-#kihml^!Bm6StCI z5N$7!g+yy%KdC2E3I71PXULOe3z*IS53u^-7%1KT7I zw+vU37sv*3AJO&`l1%ivE+%Wq7^1C?j3)Pxp+sAihuevJNmu`RHKvir$lWBLe4iX9 z2T3g{Alg{3?w4dANg~?XJlrB&V*62Z6wV?`$%CYVXnWQp<{oEf57|bZ^BUcEa3a}7 zdRp5?vzs70S!B31^hW(#e;fG`xs!B{ZiM|!yUTnSuP43YoteW@Ynq~w>SfVz;_J*g{`mZ0N!qeV-Rfvv!#&}|hTvddpdqrV zI+|$f`zK#~V^&sDZBsb$a8{}>b!J19eK#v!+Ak;ZLjNjXJafR70jq1P>uV#l&y7|` zo12VqqHVx^K3_PVopUlUp9{l@GdVTBc;&!%Qp!VRW5Q$06N3ho_)zKab z$E)+MNi50x#vflED(!V^ZButyp>SeXsHMBE>}yZ?8gu^X@zh3 t;(0|+qH{h!eYIV8x`)c5sjhgJFP=WK@;`MLuS);` diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 959aa40..9add410 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-10-16 21:36+0000\n" +"POT-Creation-Date: 2016-10-18 22:01+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -86,6 +86,7 @@ msgid "Video licence" msgstr "Licence vidéo" #: accounts/models.py:80 proposals/models.py:115 +#: proposals/templates/proposals/talk_detail.html:87 #: proposals/templates/proposals/user_details.html:57 msgid "Notes" msgstr "Notes" @@ -205,7 +206,7 @@ msgstr "" #: accounts/templates/avatar/confirm_delete.html:14 msgid "Delete These" -msgstr "" +msgstr "Supprimer ces" #: accounts/templates/registration/login.html:11 #: ponyconf/templates/base.html:101 @@ -299,6 +300,12 @@ msgid "place" msgstr "" #: planning/templates/planning/room_list.html:24 +#, fuzzy +#| msgid "Filter talks already / not yet scheduled" +msgid "Some talks are not scheduled yet." +msgstr "Filtrer les exposés déjà / pas encore planifiées" + +#: planning/templates/planning/room_list.html:25 #: proposals/templates/proposals/talk_list.html:56 #: proposals/templates/proposals/talk_list.html:92 #: proposals/templates/proposals/topic_list.html:23 @@ -306,10 +313,35 @@ msgstr "" msgid "talk" msgstr "exposé" -#: planning/templates/planning/room_list.html:35 +#: planning/templates/planning/room_list.html:37 msgid "No rooms." msgstr "Aucune salle." +#: planning/templates/planning/talk_detail.html:20 +#: proposals/templates/proposals/talk_detail.html:68 +msgid "No speakers." +msgstr "Aucun orateur." + +#: planning/templates/planning/talk_detail.html:37 proposals/models.py:47 +#: proposals/models.py:70 proposals/models.py:112 +#: proposals/templates/proposals/talk_detail.html:57 +msgid "Description" +msgstr "Description" + +#: planning/templates/planning/talk_detail2.html:62 proposals/models.py:111 +msgid "Abstract" +msgstr "Résumé" + +#: planning/templates/planning/talk_detail2.html:78 +#, fuzzy +#| msgid "average:" +msgid "Coverage" +msgstr "moyenne :" + +#: planning/templates/planning/talk_detail2.html:94 +msgid "See more" +msgstr "Voir plus" + #: ponyconf/settings.py:139 msgid "English" msgstr "Anglais" @@ -340,7 +372,7 @@ msgstr "Sessions" #: ponyconf/templates/base.html:59 msgid "Listing" -msgstr "" +msgstr "Liste" #: ponyconf/templates/base.html:62 #: proposals/templates/proposals/talk_list.html:9 @@ -350,6 +382,7 @@ msgstr "Exposés" #: ponyconf/templates/base.html:65 proposals/models.py:108 #: proposals/templates/proposals/speaker_list.html:9 +#: proposals/templates/proposals/talk_detail.html:61 #: proposals/templates/proposals/talk_list.html:46 msgid "Speakers" msgstr "Orateurs" @@ -420,10 +453,6 @@ msgstr "Assigner à une salle" msgid "Name" msgstr "Nom" -#: proposals/models.py:47 proposals/models.py:70 proposals/models.py:112 -msgid "Description" -msgstr "Description" - #: proposals/models.py:49 msgid "Managers" msgstr "Responsables" @@ -454,15 +483,13 @@ msgstr "" "Après soumission, le titre ne peut être modifié que par l’équipe " "d’organisation." -#: proposals/models.py:111 -msgid "Abstract" -msgstr "Résumé" - #: proposals/models.py:113 msgid "The topics can not be changed after submission." msgstr "Les thèmes ne peuvent pas être modifiés après soumission." -#: proposals/models.py:114 proposals/templates/proposals/talk_list.html:48 +#: proposals/models.py:114 proposals/templates/proposals/talk_detail.html:29 +#: proposals/templates/proposals/talk_detail.html:74 +#: proposals/templates/proposals/talk_list.html:48 #: proposals/templates/proposals/track_form.html:14 msgid "Track" msgstr "Session" @@ -632,94 +659,79 @@ msgid "Edit" msgstr "Éditer" #: proposals/templates/proposals/talk_detail.html:15 -msgid "Format:" -msgstr "Format :" - -#: proposals/templates/proposals/talk_detail.html:19 -msgid "Abstract:" -msgstr "Résumé :" - -#: proposals/templates/proposals/talk_detail.html:21 msgid "No abstract provided." msgstr "Aucun résumé fourni." -#: proposals/templates/proposals/talk_detail.html:23 -msgid "Description:" -msgstr "Description :" +#: proposals/templates/proposals/talk_detail.html:20 +#, fuzzy +#| msgid "Format:" +msgid "Format" +msgstr "Format :" -#: proposals/templates/proposals/talk_detail.html:25 -msgid "No description provided." -msgstr "Aucune description fournie." - -#: proposals/templates/proposals/talk_detail.html:27 -msgid "Speakers:" -msgstr "Orateurs :" - -#: proposals/templates/proposals/talk_detail.html:34 -msgid "No speakers." -msgstr "Aucun orateur." - -#: proposals/templates/proposals/talk_detail.html:37 +#: proposals/templates/proposals/talk_detail.html:22 msgid "Topics:" msgstr "Thèmes :" -#: proposals/templates/proposals/talk_detail.html:44 +#: proposals/templates/proposals/talk_detail.html:26 #: proposals/templates/proposals/topic_list.html:31 msgid "No topics." msgstr "Aucun thème." -#: proposals/templates/proposals/talk_detail.html:49 -msgid "Track:" -msgstr "Session :" - -#: proposals/templates/proposals/talk_detail.html:54 +#: proposals/templates/proposals/talk_detail.html:33 +#: proposals/templates/proposals/talk_detail.html:75 msgid "No assigned yet." msgstr "Pas encore assigné." -#: proposals/templates/proposals/talk_detail.html:58 +#: proposals/templates/proposals/talk_detail.html:41 +#: proposals/templates/proposals/talk_detail.html:49 +msgid "not defined" +msgstr "non défini" + +#: proposals/templates/proposals/talk_detail.html:59 +msgid "No description provided." +msgstr "Aucune description fournie." + +#: proposals/templates/proposals/talk_detail.html:79 msgid "Assign to" msgstr "Assigner à" -#: proposals/templates/proposals/talk_detail.html:66 -msgid "Notes:" -msgstr "Notes :" - -#: proposals/templates/proposals/talk_detail.html:68 +#: proposals/templates/proposals/talk_detail.html:89 msgid "No notes." msgstr "Aucune note." -#: proposals/templates/proposals/talk_detail.html:72 +#: proposals/templates/proposals/talk_detail.html:93 msgid "Moderation" msgstr "Modération" -#: proposals/templates/proposals/talk_detail.html:74 -msgid "Vote:" -msgstr "Vote :" - -#: proposals/templates/proposals/talk_detail.html:83 -msgid "vote" -msgstr "vote" - -#: proposals/templates/proposals/talk_detail.html:83 -msgid "average:" -msgstr "moyenne :" - -#: proposals/templates/proposals/talk_detail.html:85 -msgid "Status:" -msgstr "Statut :" - -#: proposals/templates/proposals/talk_detail.html:94 -msgid "Messages:" -msgstr "Messages :" - #: proposals/templates/proposals/talk_detail.html:95 -msgid "These messages are for organization team only." -msgstr "Ces messages sont à destination de la team d’organisation seulement." - #: proposals/templates/proposals/talk_list.html:49 msgid "Status" msgstr "Statut" +#: proposals/templates/proposals/talk_detail.html:100 +#, fuzzy +#| msgid "Vote:" +msgid "Vote" +msgstr "Vote :" + +#: proposals/templates/proposals/talk_detail.html:109 +msgid "vote" +msgstr "vote" + +#: proposals/templates/proposals/talk_detail.html:109 +msgid "average:" +msgstr "moyenne :" + +#: proposals/templates/proposals/talk_detail.html:115 +#, fuzzy +#| msgid "Messages:" +msgid "Messages" +msgstr "Messages :" + +#: proposals/templates/proposals/talk_detail.html:116 +msgid "These messages are for organization team only." +msgstr "Ces messages sont à destination de la team d’organisation seulement." + #: proposals/templates/proposals/talk_list.html:78 msgid "Accepted" msgstr "Accepté" @@ -813,26 +825,44 @@ msgstr "Accepte d’être enregistré en vidéo :" msgid "Video licence:" msgstr "Licence vidéo :" -#: proposals/views.py:211 +#: proposals/views.py:213 msgid "Talk modified successfully!" msgstr "Exposé modifié avec succès !" -#: proposals/views.py:217 +#: proposals/views.py:219 msgid "Talk proposed successfully!" msgstr "Exposé proposé avec succès !" -#: proposals/views.py:232 +#: proposals/views.py:234 msgid "Talk assigned to track successfully!" msgstr "Exposé assigné à la session avec succès !" -#: proposals/views.py:301 +#: proposals/views.py:303 msgid "Vote successfully created" msgstr "A voté !" -#: proposals/views.py:301 +#: proposals/views.py:303 msgid "Vote successfully updated" msgstr "Vote mis à jour" -#: proposals/views.py:327 +#: proposals/views.py:329 msgid "Decision taken in account" msgstr "Décision enregistrée" + +#~ msgid "Abstract:" +#~ msgstr "Résumé :" + +#~ msgid "Description:" +#~ msgstr "Description :" + +#~ msgid "Speakers:" +#~ msgstr "Orateurs :" + +#~ msgid "Track:" +#~ msgstr "Session :" + +#~ msgid "Notes:" +#~ msgstr "Notes :" + +#~ msgid "Status:" +#~ msgstr "Statut :" diff --git a/proposals/templates/proposals/talk_detail.html b/proposals/templates/proposals/talk_detail.html index 7635d26..6167041 100644 --- a/proposals/templates/proposals/talk_detail.html +++ b/proposals/templates/proposals/talk_detail.html @@ -17,17 +17,16 @@ {% if moderate_perm %}
-
{% trans "Format:" %}
+
{% trans "Format" %}
{{ talk.event }}
{% trans "Topics:" %}
- {% for topic in talk.topics.all %} -
{{ topic }}
- {% if not forloop.last %}, {% endif %} +
{% for topic in talk.topics.all %} + {{ topic }}{% if not forloop.last %}, {% endif %} {% empty %} -
{% trans "No topics." %}
- {% endfor %} + {% trans "No topics." %} + {% endfor %} -
{% trans "Track:" %}
+
{% trans "Track" %}
{% if talk.track %} {{ talk.track }} {% else %} @@ -44,7 +43,9 @@
Salle
{% if talk.room %} - {{ talk.room }} + + {{ talk.room }} + {% else %}{% trans "not defined" %} {% endif %}
@@ -53,11 +54,11 @@ {% endif %} -

{% trans "Description:" %}

+

{% trans "Description" %}

{% if talk.description %}{{ talk.description|linebreaksbr }}{% else %}{% trans "No description provided." %}{% endif %}

-

{% trans "Speakers:" %}

+

{% trans "Speakers" %}

{% for speaker in talk.speakers.all %} {% if forloop.first %}
    {% endif %} @@ -70,7 +71,7 @@ {% if moderate_perm %} {% if not talk.track %} -

    {% trans "Track:" %}

    +

    {% trans "Track" %}

    {% trans "No assigned yet." %}

    {% for topic in talk.topics.distinct %} {% if forloop.first %}

    {% endif %} @@ -83,7 +84,7 @@ {% endif %} -

    {% trans "Notes:" %}

    +

    {% trans "Notes" %}

    {% if talk.notes %}{{ talk.notes|linebreaksbr }}{% else %}{% trans "No notes." %}{% endif %}

    @@ -91,12 +92,12 @@

    {% trans "Moderation" %}

    -

    {% trans "Status:" %}

    +

    {% trans "Status" %}

    {{ talk.accepted|yesno:"Accepted,Declined,Pending decision" }}
    {% if talk.accepted == None %} -

    {% trans "Vote:" %}

    +

    {% trans "Vote" %}

    -2 -1 @@ -105,13 +106,13 @@ +2


    -{{ talk.vote_set.all|length }} {% trans "vote" %}{{ talk.vote_set.all|length|pluralize }}, {% trans "average:" %} {{ talk.score|floatformat:1 }} +

    {{ talk.vote_set.all|length }} {% trans "vote" %}{{ talk.vote_set.all|length|pluralize }}, {% trans "average:" %} {{ talk.score|floatformat:1 }}

    Accept Decline {% endif %} -

    {% trans "Messages:" %}

    +

    {% trans "Messages" %}

    {% trans "These messages are for organization team only." %}

    {% for message in talk.conversation.messages.all %} {% include 'conversations/_message_detail.html' %}