From 20d1cc9d59f6de5d5461e4f66145d087fbe168dc Mon Sep 17 00:00:00 2001 From: Emilie Date: Thu, 17 Nov 2016 16:08:15 +0100 Subject: [PATCH] Event : correctin EN date --- app/locale/fr/LC_MESSAGES/django.mo | Bin 13605 -> 13632 bytes app/locale/fr/LC_MESSAGES/django.po | 32 +++++++++++------- app/organization/formats/en/formats.py | 2 +- app/templates/agenda/includes/event_date.html | 14 ++++---- 4 files changed, 28 insertions(+), 20 deletions(-) diff --git a/app/locale/fr/LC_MESSAGES/django.mo b/app/locale/fr/LC_MESSAGES/django.mo index 36d8a2744b3d3155bb5d2b24fdabe8ef59fa286e..b59060d37596d302552f8c8ed593cde9028894ae 100644 GIT binary patch delta 4007 zcmXZf4{+CI9l-JLZ?ZAiXs}KGI~XnI_$x6Q2zh{KgDXQ&^Ar$46QzXkWI+D;rj^OX zH2gtm2?wZ$3rK+r1TJ%w#}d!XG_@;m6)JxmC|%%HyWVfUAMSRq=l}D0KF{;}Z9Kc^ zEsL##nY4XizSd0r8&=mFe!glON`*AG9v(f$;x?!$Qk_^CNoQ*YD zg5N^}U5(CPkArbD8puH`P0}PeOkpJr?_w96)i>Md26Umh=!8456z@iok)-ItYtamB z#46l^*JCRhV4r?jAXVrA>aZ7%#!~iArciK$ucHCn5Y9n2nvd1kga-6P^gn~nYe5&@ z6~2fD_EPk>Mf)GoD|rVE>=>p66i!jl(`d>*MFaUCdUpl=vwC;@9Q87ETot-e9Xf7o zI1%0GN;G3L(e-Xd1HCoc@9aFE3$(Lm-$eR1?R4Iuv)I*5Dj8um@8Lre+m7;n8pd8qjuh!I$tk`~!Nz6_;cgNzwW$B!=WC z=!V(P{Ni1rqAfnDeZ`=Y%So&PF&Wp71)d(@Ak z8Tog#ci~iKv=qzy{9i)BlZ?F3kR;>Lji-gzp?7x+8sM_<0W{Dbp@B7{fviQ>+lXF4 z3p($Y(Z3fR--?APg|=vT9WOjGbV57&22P+0{})}bXmGZ130m)kZrB^0UyY6*i3Zq! zj{7ot@~P-syB1RiE}-CmZ=SM8h`h=)Y zLf4&&7vpsF0P|7`ZoCAI{C+gWtI>gL&<(cYqFj>fz}fJ7Eo!jrLx_G#e^bfIrV|2*W|I9Z6Z z@gX$jN6kxVD;*cJbYp6nEk!mh)zEBg}K zeifRTTf&8C;ETh1&~?8X_3vXD`zNa?IPpnz!%gTP6i=fm+Zy%V=mLAOJHCwF@Nm@M zM&Hu=(cTfBN58-dhG!Y*gJz%xQzNX4j?q{`eG~P+X~~b#*S`Zz{cq6)4r6ybiY{~l zUFcuv_@a?neIOdxDD+cx1$xC-qx;;3W@PzD@=tb>)ik)^UNj@E=!8S)gd^w%pP&=F z@&JzEK=c3wqqD%eq3cv4zp0Zdbo|8Vzb2fG9_;os8Wy7)tc;Gw&^NFiUEt^83)qAD zD`+PE6zxZ%eijX&6TPD1%d(C7h1FqQn2w3U1TL-J%WxO^*bbrxIfP!>Uy*TX(m|mo4d;-*n3Li$*+$jqgi+{;uf!6ZiTo;0 z=As+j7wta`*PvIpA$&S)K|fv3qw{uQH}+2s#DG`OlOIM;{AYCF-=h8j@?V7HV>B~` zU(Ck!4F{no9g1dZI2!o)sDA|w?Aq`~tn~9gkAkoJ9`x=WLGS)?2jEZ91-GH&UPKpu z4c+iBXsVB*0iQa0~iXya)NSF?j<$KnFVSqWUajCFuO}dh+i{s%X#==z^D{pN2*>;<@OR+>Qov z7gpj5bm3<7@vcM1KZD-&4m9O2M14>6??W?mu)ZPt?tYDi3K~8{PyU~<$G9xTgU}4s zpc^#gyOlkkJDJ~CR-5}c-(I#YcP!uBvo?2n_pf@+$mLGu3(J@1I`a3I*XBOTKU+Sd z@B=2D$bVLz&mGSD*RcES PkS)Cm<}b^ytzYwh`n8Ls delta 3981 zcmXZf3v8Cv8Nl)LVJQ?!uYfDp0-XgBXt_k{)I`8^4ut6fhQUzSB(uu|GL&=!KId3u zb6mO)qFls@S>zH#R=0E-9U7pJm~F^pV>7~BhKf)`mc=Lw`~P_#6Y_h{?K#hR&ij7g z!IodQV-YACsyNiI0zlD z4ePNF?XgJ6bSpZ4TD0%Z+W9m)Iu_s}CM=HjvG6#S(0>ZMdD!>* zlzQV*G|`pl`X{g!+t5UQgQY2-(yKhQ(s2}vaLSjmjhfLwccTmDVks^{ijkI}f!ClF zSdT;SmpB^_pb7S<$r33;4^V@ZI223SKQ;2;2DhULG>0?Ljqbr=xEM`nZH#Y1*KI)q z?+kaLiM<%(9nt>=dL^A`V((zS8xQaDpr_H2y^khx0lm9Vqy0IS(Y}h#D;tn)RD;eN z5spSTnt)d94m93OG|_KF|J(u8-xDmR!;F@MkD@1Cg$Di^dZIQofo*sz?g>9YH>~4D zFwS`N{cS?m--RY}PqY`r_~L=opTnd_>F`cAq6zIp7wio?(1Z@72^>c^JQL$x(f$G} z=r7?@a^3)R-YE1cZ^k;DfhM*r&x56DMHj3N*P#h*M+3fyyYLU_3BNlytH=_x-HPm; z9z!?Wj>g>+?hju^5BPhuLism&Fu>a};ZzK~hePS_LNhJn)z<##{2}N&@MSb$L)e7Q zn-YF4ycb>f&1f$~*5}hhJb1Uu(Lk%wm*fewJ|2D7refZS_wwL``Dm#YqNQAdCa@CiUysh)j#lb9ymk`wN;;x_Fxs8yLH>m9 z^EWiX_tAJ=wbb8*SLkrVB7Wu^s6-bIMaM^?;|(!>8=Am$tipL%jSr(IdmLTgh9Dycyl^zB~_R{2&^5IXbZw4ZHzcaw%=b`fha8WdTRtklpz>^dz^Sm6{g)Gtd*? zhgRm>F}?z=Og`HAwb8LL+=45auru02>*ETrnEr)3a42(4_nYuA3+m2 z5$)4R=yX17=Tr5_Y+@}gWnc_ii5+MKo{#a}=x6mi^rd_Q{pmgt?F;B%!&i|HBV9Kt zr3E+wP2_Pj?uKv^_V@eW!h?76686M{Xr+%~4}1$f*594QHW= z&k5(FaTi7Vd+2`4u$cYRk9lyzwde_+L`$|I+S||o&tfm!g(cV??bpzk>1gzy49}oH zT<6dVTtzETIyy_R67vpR&x0G*p&K=XP3Y$}1>JBq`U7%5dV;0cjE~`6coe;ws++Qn z>d=>O6uSO4bi5g@*xZ|_zZ*P22VYkD0s8iDMoYgJ4bYCguoDgRHX7(%bbeQ~i^gP$ z^+&Jh2IQZGX%f26474KmBgII|$54L*K1+vpwi{irA6;++-QX0u@FM;ji+B+{!8tUs zOK6-c$luVZcw9Dr1Uf!BoQfW7X0+$zd2oY;F|Y!C2kdvlpM+0iAKLrSfUidXk!b$| zP2engMW3J>v{@Zw-v3_^Vi0?|9w1o@^w) z0|#RVdcu?Fx{uMyUPjk{jvl0VBKPk@--%hk;po>e4n5JG=)#$3BD1kCK7a;(1bul| zq4R%%mU=UK=i8!x2YSF4(4X=HSdDK@tj|t-h7M2uDO%d1Nm&I-(7=NVHRbzr=L*Nl z>vQJ|m&*6%QsJ43`dnB0;fh(g+{cA}RV#8A3hS!sa~~9bTQ#e@KN24mN~#OF4-3y! r56zt|yjK0A+{N~$zL)zHCJz5|k4d$S6K-j2Z0|i{XJz4~i5ve9h;M)P diff --git a/app/locale/fr/LC_MESSAGES/django.po b/app/locale/fr/LC_MESSAGES/django.po index db6d5297..ec140b37 100644 --- a/app/locale/fr/LC_MESSAGES/django.po +++ b/app/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-11-15 13:11+0100\n" +"POT-Creation-Date: 2016-11-17 15:57+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -24,8 +24,9 @@ msgstr "Pages" #: local_settings.py:90 templates/index.html:53 #: templates/media/playlist_detail.html:4 -#: templates/media/playlist_detail.html:21 templates/media/playlist_list.html:6 -#: templates/media/playlist_list.html:11 templates/media/playlist_list.html:15 +#: templates/media/playlist_detail.html:21 +#: templates/media/playlist_list.html:6 templates/media/playlist_list.html:11 +#: templates/media/playlist_list.html:15 msgid "Media" msgstr "Media" @@ -1981,15 +1982,19 @@ msgstr "Événements du lieu" msgid "Locations" msgstr "Lieux" -#: templates/agenda/includes/event_date.html:30 +#: templates/agenda/includes/event_date.html:27 +#: templates/agenda/includes/event_date.html:47 #: templates/agenda/includes/event_date.html:50 -#: templates/agenda/includes/event_date.html:53 +#: templates/agenda/includes/event_date.html:66 msgid "and" msgstr "" -#: templates/agenda/includes/event_date.html:44 -#: templates/agenda/includes/event_date.html:65 -#: templates/agenda/includes/event_date.html:69 +#: templates/agenda/includes/event_date.html:41 +#: templates/agenda/includes/event_date.html:64 +#: templates/agenda/includes/event_date.html:72 +msgid "through" +msgstr "au" + #: templates/agenda/includes/event_date_line.html:10 #: templates/job/inc/candidacy_card.html:22 #: templates/network/person_detail_multiple_activities.html:78 @@ -2074,15 +2079,18 @@ msgstr "" msgid "Also discover" msgstr "À découvrir aussi" -#: templates/email/account_approve.html:3 templates/email/account_approve.txt:3 +#: templates/email/account_approve.html:3 +#: templates/email/account_approve.txt:3 msgid "Hey there, a new account has been created and requires activation." msgstr "" -#: templates/email/account_approve.html:5 templates/email/account_approve.txt:5 +#: templates/email/account_approve.html:5 +#: templates/email/account_approve.txt:5 msgid "Name" msgstr "Nom" -#: templates/email/account_approve.html:6 templates/email/account_approve.txt:6 +#: templates/email/account_approve.html:6 +#: templates/email/account_approve.txt:6 #: templates/network/person_detail.html:34 #: templates/network/person_detail_multiple_activities.html:34 msgid "Email" @@ -2494,7 +2502,7 @@ msgstr "résumé" #: templates/network/person_detail.html:46 #: templates/network/person_detail_multiple_activities.html:52 -#: templates/pages/teampage.html:128 +#: templates/pages/teampage.html:129 msgid "Team" msgstr "Équipe" diff --git a/app/organization/formats/en/formats.py b/app/organization/formats/en/formats.py index 1a36aa21..565a99d5 100644 --- a/app/organization/formats/en/formats.py +++ b/app/organization/formats/en/formats.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'N j, Y' -DATE_EVENT_FORMAT = 'D, F jS' +DATE_EVENT_FORMAT = 'F j' WEEK_DAY_FORMAT = 'D, jS' TIME_FORMAT = 'P' DATETIME_FORMAT = 'N j, Y, P' diff --git a/app/templates/agenda/includes/event_date.html b/app/templates/agenda/includes/event_date.html index fc043556..6230768a 100644 --- a/app/templates/agenda/includes/event_date.html +++ b/app/templates/agenda/includes/event_date.html @@ -38,30 +38,30 @@ {% if period.date_to and period.date_to|date:"H:i" != "23:59" %} {{ period.date_from|date:"DATE_EVENT_FORMAT" }},
{% if period|period_is_more_than_hours:4 %} - {{ period.date_from|time:"WEEK_DAY_FORMAT" }} {% trans "to" %} {{ period.date_to|time:"TIME_FORMAT" }} + {{ period.date_from|time:"DATE_EVENT_FORMAT" }} {% trans "through" %} {{ period.date_to|time:"TIME_FORMAT" }} {% else %} {{ period.date_from|time:"TIME_FORMAT" }} {% endif %} {% else %} {% if event.periods.all|length > 1 and not forloop.last %} - {{ period.date_from|date:"DATE_EVENT_FORMAT" }}{% if event.periods.all|length == 2 %} {% trans "and" %} {% else %}{% endif %} + {{ period.date_from|date:"DATE_EVENT_FORMAT" }}{% if event.periods.all|length == 2 %} {% trans "and" %} {% else %},{% endif %} {% else %} - {{ period.date_from|date:"DATE_EVENT_FORMAT" }},
+ {{ period.date_from|date:"DATE_EVENT_FORMAT" }}, {% if event.periods.all|length > 1 and forloop.first %}{% trans "and" %}{% endif %} {% endif %} {% if same_time_in_periods and forloop.last %} {{ period.date_from|time:"TIME_FORMAT" }} {% elif not same_time_in_periods %} -
, {{ period.date_from|time:"TIME_FORMAT" }} +
{{ period.date_from|time:"TIME_FORMAT" }} {% endif %} {% endif %}
{% endfor %} {% endwith %} {% else %} - {{ event.start|date:"WEEK_DAY_FORMAT" }} + {{ event.start|date:"DATE_EVENT_FORMAT" }} {% if event.end|subtract:event.start|get_attr:"days" > 1 %} - {% trans "to" %} + {% trans "through" %} {% else %} {% trans "and" %} {% endif %} @@ -69,7 +69,7 @@ {% endif %} {% else %} - {{ event.start|date:"WEEK_DAY_FORMAT" }} {% trans "to" %} {{ event.end|date:"DATE_EVENT_FORMAT" }},
+ {{ event.start|date:"DATE_EVENT_FORMAT" }} {% trans "through" %} {{ event.end|date:"DATE_EVENT_FORMAT" }},
{% if event.end and event.end|date:"H:i" != "23:59" %} {{ event.start|time:"TIME_FORMAT" }} - {{ event.end|time:"TIME_FORMAT" }} -- 2.39.5