From c3573867d0fb9d0d2261c4249d09bab5f84202f1 Mon Sep 17 00:00:00 2001 From: bkfox Date: Fri, 31 Mar 2017 18:27:30 +0200 Subject: [PATCH] small fixes in templates --- aircox_cms/locale/fr/LC_MESSAGES/django.mo | Bin 17221 -> 17717 bytes aircox_cms/locale/fr/LC_MESSAGES/django.po | 45 ++++++++---------- .../templates/aircox_cms/program_page.html | 2 +- .../templates/aircox_cms/publication.html | 4 +- .../sections/section_publication_info.html | 4 ++ 5 files changed, 27 insertions(+), 28 deletions(-) diff --git a/aircox_cms/locale/fr/LC_MESSAGES/django.mo b/aircox_cms/locale/fr/LC_MESSAGES/django.mo index a0fb2d1e4ccc62be43dd078fdf8ad5b13dc1320c..9b4b324dd89f885e1a8f6050bc39a2976c88f455 100644 GIT binary patch delta 5082 zcmb8xd303O0mtzh5<)_NEQFA-ga;Cm01^VSV}k5ErMOgChslHtgh|NElubK|EP^bN zutN(JkgY6bKpIvdpi;md@YfM6tF~cwsb8$Sz;0mmV>o6I2AeWkB7>j3Y zFQU%Bj=JS1SO@Q7lraJG4TXm6c!2yf^{MCv7S_eKn223a#|NQq@Det`$v6dH!8v#v zYvUw(MFXY~)$lab{bpkZ&c}MRZ}w2o1xHamJ!$)%y}ue8vHv=%BcI#*AEG)E$w6Hg zhdM8rKXKR=8)H{&iz873n~iGkbxfpvvzUTzu+erq>coAhDLsnq@D#@5zfm*s9X7@K zDdC2*k-?jM)T11O{4=HeQG<(6_gjYQ_$mx&iZ)Sbfm_kSGpG*SLN#<3b>WYw4n#97 zHJpNdu@mZgKR%7CQ6s*FZSV)%j8tRNsSiiZW_wW$SE4%l zE~@9}Q6su+dkwEp{|oB8J!#>^c>wdNpFj=hd(?H&EF85{uL<+79yMc!8tjE?Ud-mN!wbk$Gcin`I+PxupsC8jfj9=A z!VNe8tI>gtc%WTyCU(Mo*a82J6&T;#nC`d@b^K%0@pwk3dLF97GcXHhqB<7XLP0&< zVedGIdasY5X5_4W{EF>IsF8k#dH5Ah!dw=Bp8ZPn;}ukc1Fi709*$~o0`@{Dw$}T< znS!R|9BTFc6*V>YY`?|+)N8d2FQ!4*k-7(YoMtnsp-Rlg)2N32g?e=Nus1$Lo!7Hf z_;??T(fdDuf<`*hb{u9S>w+WP`E6D>2De>F5WGdzMfQ5~qjo46fygM}7xREexZa~0LmFY(z3I>>?;Ox?#Trp0;^>)`jOwHDQm`PU6n>3%eJL``is)QNpj z4G%@Fkr(X!F4PoGN8P9lwI&v#I<_8lpKYi`x*zojKCq8}ioDt8KLHA}D8w?aOK=`) z#PwM@YM>#ifmGBD+hY&xhMM9TsPkUM7+hex95sNo$XDBJM$OzisPiwOIvTi2K{x&g z^~L)PlShTWp2u*a+0|F{qiFhz)Qis=*7g?#kP1#EzKP;bk9)T52zqoIz+ zBQKn3ilg-Y=Tp#XUV-^|05kCm)W{pNWc6w7i)vsl>c;C)4edoe+hZ7y*Rej{Mm793 z>b&nz9f;+7to@C!F72CU6mDTAYJ_z=hZ~5;=cut@3ZyNw z9yL=RqNetmUB6}5@1P#VecNbS(<4biz0R$1D(3c}dow9)VuyYtl6!^^j7Ck>32cbx zP+zb=qdp`bV`vfaQ>G73KBnLVREPYi2Iu2gT#4Cu4|y6UmB!L=cz}XNR*3rfEJlrN z4<_RQ9Es;p=QZRcnTC2RTA&_97V44pLe`lXfuZ*s>r!8gdX%eB_uYttF>sKAE_{H^ zF^=KUNt2Cyi;N3(!AdN^ov0Dk<5kfJnxY!&g1j&$A9dqWd=e|s!aJxLis=(xtSyk4 z2$+r(G_?h&DKA1bSc)3q0&IfIF%@^CX6P&q#P?A%(twqxDNjaquobEUxu`WX5wma& zw#3t@-yd_6f_fgyihCY=qI&uk>c+cJ9o&yB6LSbB<6YFujp`R}*n!Qcmtax^s~k0; z&Hck~*G|;=L5#%nm`3~N0)=$^6!kjQ8ek09hkklBl`hhOEFk-crh5|6E2~YTrZ1sa zkEa+K#7SIEPLnaD=BBn@Cwk0*L;N{RT9BngBY(8*r4W2n!B@y8GKf@@*GSE6KNSyI zZ|~e-s|BfTMVQb>ZG5<_@$;<7CDMo-B(;d9Sewq+7Al4RXof1uM0;P7ZA;WTd7HdJ z_~w{1WG9(HwDCCzt)X}DeeDR{JyZz)nFa00&xjV`XrlM^(N;y_82L51K^l@A@@Uh7 zTWwcfzzgIeIZpJQ`2#siMv-eI)V>e3Fv`hVqD`;fPly(vUNddHdH>ty*rhjZe~x<3 zi%C5)mpr~*X2(%-g+!C{B(R7-Tgh1R_@>t-vc^sa<=J+&YzbDybnY~Z^k`$5# zWFc{qfn*ISBD*yIJt(Xre$tj~CuQUa=|iFjU*FLGS~lVy;wB@>39^K&BAG<*{}!^F z%p*S~kG9`X=w?@5#AzyPbz3U1)giwNm5lM?0dm!@$Jj2$&E!`kgZzT@CohvBMBB6E zrBEsSD>%X~x4}P>)?_#tN7TM~l_Ze2NX=~rm2)+Atfbsi^^B|n$Lwschs$Ig1@$@6)Z^p2Ct=c^O%SWv&^1m&eJ)y>oOzL|(8u zu_`9US>mxu9loN9@+LX`oJB6@G*>};tISpG@VN@CQvc*)x6|Qsmw0Hj%w>7q?C?zS zT5gZm=W-NSC54u+$YnW;+{FcDE>DNx@g@mT6;sobE5Xs&;e4TjKGBPVt_v@Ru<u zQW3CpeLzdfQzey3%8H;;l!O2lBN$;&Mj6FcoN4TcFgk-u`~UWyV9(^+-??}1z31F> z&b>(vZwzbR5az$)3V+5>TFKqyKqq4o!i>r3roG1O>S4?<+>NPt9=l)%mod>8g*~x1 za;h1Mk(h4HLmfW}b;&8%8Ot!-7{8fMC5{~nksq^~4_zRDU9k>n)9gon%cb(Jim_OV z+^qQxCgN)3$L!#Pn=*$`Q+Wz|;b*7@Z=tTIo$7dJ^lOM>sr191=*DzZ2Z~V*m7z|o zLUo`P)$kLTkI$pd{{nNd3%9L1F2F%pY2AiNY`=*b$t&@Ue+-qc*dhOmY9OY!GiOPt zhEq@-O+)oO3w1|htp#|V?fX&3^-XXV=KvhT_HfhPJi)zQ8!1$|2Pq9ObON6p5Pi1XPDTsKu6o>QE-;VGc42W+iHbw)&~0Q#pqB z;&m*?OvZN$4)qvzU}6K9idoo<`u;ZR`_#V9_AFEf1DK54Q5|VSb?mg=_P0{e zb9@Ok0{^rJd~N*!b!S}|Cfz|#oQ2bH3BH1A$j1WEoQ^;>l#f5bi8v6~qV9Y@YLOmC zro?Yror?JgC-BARs6{ix&BbskGTLS>s-Zgc;$BokEvPAK#T@(;bzD+^=lg-Er^<`E z!I9Rn=+X0EL`8F6gF0{(Y7W<L4#gn@oHt4d4KqQ&zpreHHN3+8L&kv1;6s~3iA6Tj`Q$STsDaDkDyXA*ja>Ss7106^}Mb@-N`0ootb^8jyB-~ zVRR7H;6xTg9@b)KJc@Dn7V7*9sG)B|jpz;3akssUzgB-IpR+jPP+#=NaP*=sGz_&C z@-Y&Nu`8CL7H0)&=+~jX--$f2rXH7LGj7B@hEX^CHtPE4{8ZGy1?-AnU^d=B4e?Os zLkH%d7Uwu?A*!R(P*XGmHF8y`;~z(LWHaiz&!JvudoT*$K%M75O@+>xE2y4DvXpf| zENbWyQ5{J`HJFd;NFl0$X*e89QFFZ+bzU864IM^}#6{FdT}L-YF^{~n{3eBpE_ffR z=TlJ)J!rSf(9QN7hQ^!e4COG?cCOvdM-BZHYdLBPDlr=USb>{x z8GdWG7c;LKvC9~TS5YsjZ&2@xTUp$WhB%w<>jhJay>Jz3P6Mch_TUU`Krcp*c3#OD zn80=g>WVf;Cbx|4$}T|GWWP($2=y5L3B$bE=Ocmws+xW*g9>1G32N7RXJWGzt# zpC^Zi*2gB=50(3^Vh_xZ7Uqx1{LMbBIL@WL-@;F&YRuYvL$-q#Jg@syRDq{$<7Ak+U&d0~d8S*fR zCKJePazyj5)i|BB7d z949{~D({k6v~LcRlSGfpRH8D&A@q5a&lK_mc`mfaS+J^}B9loLi6U>4hZ`^|2<)qpd}0CLvu`?K{0e3W!2dX802koQ70=VLvbClkqEoL!;Uw#U|Y zS@kM@n!M)p%lV^H-#tYRkR2qMRFHVmnH(cOC2tUwfJ5lr@FevuB!-M8eTF-s(W2t4}vi^1Q0K zl}qL>n$4czL$0PS0dL~aU|nK#c<@@keG$POo)0>PXN(?|9$fAX5A%AGt82=uYP{9% xiY3*RO9nUXa(j~JE}G-5PNDMu*E;6A9T{jz&j?N#bv8U$GP%(terms)s" msgstr "Chercher %(terms)s dans les publications" #: templates/aircox_cms/dynamic_list_page.html:19 +#, python-format msgid "Related to %(title)s" msgstr "Relatif à %(title)s" @@ -845,8 +837,9 @@ msgid "Schedule" msgstr "Horaire" #: templates/aircox_cms/program_page.html:18 -msgid "%(day)s %(start)s until %(end)s, %(frequency)s" -msgstr "%(day)s %(start)s jusqu'à %(end)s, %(frequency)s" +msgid "" +"%(day)s at %(start)s until %(end)s, %(frequency)s" +msgstr "%(day)s de %(start)s à %(end)s, %(frequency)s" #: templates/aircox_cms/program_page.html:24 msgid "Rerun" @@ -860,33 +853,33 @@ msgstr "Ce programme n'est plus actif" msgid "Go back to the publication" msgstr "Retourner à la publication" -#: templates/aircox_cms/sections/section_publication_info.html:12 -#: templates/aircox_cms/sections/section_publication_info.html:13 +#: templates/aircox_cms/sections/section_publication_info.html:14 +#: templates/aircox_cms/sections/section_publication_info.html:15 msgid "Parent pages" msgstr "Pages parentes" -#: templates/aircox_cms/sections/section_publication_info.html:27 -#: templates/aircox_cms/sections/section_publication_info.html:28 +#: templates/aircox_cms/sections/section_publication_info.html:31 +#: templates/aircox_cms/sections/section_publication_info.html:32 msgid "Tags" msgstr "Tags" -#: templates/aircox_cms/sections/section_publication_info.html:45 -#: templates/aircox_cms/sections/section_publication_info.html:46 +#: templates/aircox_cms/sections/section_publication_info.html:49 +#: templates/aircox_cms/sections/section_publication_info.html:50 msgid "Author" msgstr "Auteur" -#: templates/aircox_cms/sections/section_publication_info.html:48 +#: templates/aircox_cms/sections/section_publication_info.html:52 #, python-format msgid "Published by %(author)s" msgstr "Publié par %(author)s" -#: templates/aircox_cms/sections/section_publication_info.html:58 -#: templates/aircox_cms/sections/section_publication_info.html:59 +#: templates/aircox_cms/sections/section_publication_info.html:62 +#: templates/aircox_cms/sections/section_publication_info.html:63 msgid "Date of publication" msgstr "Date de publication" -#: templates/aircox_cms/sections/section_publication_info.html:68 -#: templates/aircox_cms/sections/section_publication_info.html:69 +#: templates/aircox_cms/sections/section_publication_info.html:72 +#: templates/aircox_cms/sections/section_publication_info.html:73 msgid "Share" msgstr "Partager" diff --git a/aircox_cms/templates/aircox_cms/program_page.html b/aircox_cms/templates/aircox_cms/program_page.html index faed6b5..9eb5af5 100755 --- a/aircox_cms/templates/aircox_cms/program_page.html +++ b/aircox_cms/templates/aircox_cms/program_page.html @@ -16,7 +16,7 @@ {% with frequency=schedule.get_frequency_display day=schedule.date|date:'l' %} {% with start=schedule.date|date:"H:i" end=schedule.end|date:"H:i" %} {% blocktrans trimmed %} - {{ day }} {{ start }} until {{ end }}, {{ frequency }} + {{ day }} at {{ start }} until {{ end }}, {{ frequency }} {% endblocktrans %} {% endwith %} {% endwith %} diff --git a/aircox_cms/templates/aircox_cms/publication.html b/aircox_cms/templates/aircox_cms/publication.html index caa1c11..cbfae93 100755 --- a/aircox_cms/templates/aircox_cms/publication.html +++ b/aircox_cms/templates/aircox_cms/publication.html @@ -41,11 +41,13 @@ {% else %} {# detail view #}
+ {% if page.body %}
{{ page.body|richtext}}
+ {% endif %} - {% if page.links %} + {% if page.links.count %} {% include "aircox_cms/sections/section_link_list.html" %} {% endif %} diff --git a/aircox_cms/templates/aircox_cms/sections/section_publication_info.html b/aircox_cms/templates/aircox_cms/sections/section_publication_info.html index 3fd5b21..fac8a85 100755 --- a/aircox_cms/templates/aircox_cms/sections/section_publication_info.html +++ b/aircox_cms/templates/aircox_cms/sections/section_publication_info.html @@ -7,6 +7,8 @@ {% block content %} {% spaceless %}
+ {% with ancestors=page.get_ancestors %} + {% if ancestors|length != 1 %}
{% trans + {% endif %} + {% endwith %} {% with list_page=settings.cms.WebsiteSettings.list_page %} {% if list_page and page.tags.count %}