From ef56444bf69f3d833dbadbe991af953b705fc12c Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Mon, 11 Apr 2016 23:54:43 +0200 Subject: [PATCH] update free event message and ocales --- app/locale/fr/LC_MESSAGES/django.mo | Bin 2661 -> 2765 bytes app/locale/fr/LC_MESSAGES/django.po | 47 ++++++++++-------- .../agenda/includes/event_metainfo.html | 5 +- lib/mezzanine-agenda | 2 +- 4 files changed, 32 insertions(+), 22 deletions(-) diff --git a/app/locale/fr/LC_MESSAGES/django.mo b/app/locale/fr/LC_MESSAGES/django.mo index 5e598a6d3d08f42933d55196b987fcfc4b384223..c9a1f275287087ba34f003f6ebbcc6dcb5edd1a7 100644 GIT binary patch delta 1215 zcmZA0Pizcf7{~E_9~2a!0CI`-5=!i9rF4@5+Kf19_7nC$a@=AE7Qd7t;4nJ+CLT1$)Z z=uN|sBsz)55o7k@$O;;c15smiI*zL_gLQZmYcXpLtVOKn`bBi`GFIaQtidO!@y~Fz zF(vbolO8V2BR{i5qXa*#Rg8|&Z@@-uwuS zIH3}AADi*Hz2P0Mqd$+D=&QZ{3$=m>Su}ABHE|qOXs5m2i(1g2HH|847m~v4$0p`C z8T-dERH9S%hI7_w*jXo48~ zuL;j`K`Xq3dIzqeUbZ`^6+A)>e1W>}HEQCw$P=mL&<^NJX(y6|z9y~GA=VNaucDP# zi|Hry{uw=jorEePUuA_**($kwbT6O$rwZvJ^s;UxdI=pnhy>9==nLCSsQ3+p-iHBV zoG=^JaOf+jA_fUPN9}~Rb%@X|tS7b+{~nv@Y$3Ma7>Zu&87p|6El3j@v}|FmE9 zvQFr^#n5rjyMEwK244A9^n0W_nc6*^Ed>J?6bcUNA{|5=bSVfzhVDA3 zIEc7()g_R%OA!$(9jZ7;2Bo4)hZaPTg5PhvA;vzkC2eXf8e*dHxLFGR~|0@u;`ZegDF!+k2d>6nWH zp5lJmFVKZ*vHvZa`4YPDXLR8@n&{8izk%c!{zhHZ#4<=%=s@Q!*w6Z5kctzXi3290 zlgJgy-0tvNrqKizSiJ+^q3y5HRpbh5+??+>Zbt_VKpQ&WD7N7^Rvb7*$U*(N~f($n|pQ2D@81f8Tu{9exy}=ngKT z4_=7_ub~UyMBap7ZX+T88J>jyo&$uZafsMU_`I7LBv?P3AS@pJX~KkDKNJaz2{f0( z&5fqIiS!T!;utYNScZwC#6F^r=qDPxM8AWRgyrCW8XF(mLgN(SvG}e$R*R?Lzu>ry irqWCO2r=|zB7IcdNY|1~sW?6|QvK0VORCG+&Ey|}1WpzJ diff --git a/app/locale/fr/LC_MESSAGES/django.po b/app/locale/fr/LC_MESSAGES/django.po index 5762b71f..eb0458c7 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-04-11 10:22+0200\n" +"POT-Creation-Date: 2016-04-11 23:54+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -78,7 +78,7 @@ msgstr "" msgid "photo featured credits" msgstr "" -#: festival/models.py:79 festival/models.py:205 +#: festival/models.py:79 festival/models.py:212 msgid "events" msgstr "" @@ -86,55 +86,55 @@ msgstr "" msgid "artist" msgstr "" -#: festival/models.py:122 +#: festival/models.py:129 msgid "media id" msgstr "" -#: festival/models.py:123 +#: festival/models.py:130 msgid "open source URL" msgstr "" -#: festival/models.py:124 +#: festival/models.py:131 msgid "closed source URL" msgstr "" -#: festival/models.py:125 +#: festival/models.py:132 msgid "poster" msgstr "" -#: festival/models.py:160 festival/models.py:176 festival/models.py:195 +#: festival/models.py:167 festival/models.py:183 festival/models.py:202 msgid "event" msgstr "" -#: festival/models.py:163 +#: festival/models.py:170 msgid "audio" msgstr "" -#: festival/models.py:179 +#: festival/models.py:186 msgid "video" msgstr "" -#: festival/models.py:194 +#: festival/models.py:201 msgid "audios" msgstr "" -#: festival/models.py:204 templates/index.html:39 +#: festival/models.py:211 templates/index.html:42 msgid "artists" msgstr "artistes" -#: festival/models.py:206 templates/index.html:47 +#: festival/models.py:213 templates/index.html:50 msgid "videos" msgstr "vidéos" -#: festival/models.py:207 +#: festival/models.py:214 msgid "blog posts" msgstr "articles" -#: festival/models.py:208 +#: festival/models.py:215 msgid "pages" msgstr "pages" -#: festival/models.py:209 +#: festival/models.py:216 msgid "playlists" msgstr "" @@ -288,6 +288,10 @@ msgid_plural "%(comments_count)s comments" msgstr[0] "" msgstr[1] "" +#: templates/agenda/event_detail.html:83 templates/agenda/event_detail.html:87 +msgid "Add to" +msgstr "" + #: templates/agenda/event_detail.html:115 #: templates/agenda/includes/event_card.html:52 #: templates/agenda/includes/filter_panel.html:74 @@ -305,7 +309,7 @@ msgstr "Évenement précédent" msgid "Next event" msgstr "Évenement suivant" -#: templates/agenda/event_detail.html:183 templates/agenda/event_list.html:77 +#: templates/agenda/event_detail.html:184 msgid "Subscribe to all events in" msgstr "Abonnez-vous à tous les événements dans" @@ -360,6 +364,10 @@ msgstr "Cliquer pour voir la carte interactive" msgid "Booking" msgstr "Réserver" +#: templates/agenda/includes/event_metainfo.html:15 +msgid "Free entry. Limited seats available" +msgstr "Entrée libre dans la limite des places disponibles" + #: templates/agenda/includes/filter_panel.html:6 msgid "Upcoming Events" msgstr "Événements à venir" @@ -677,16 +685,15 @@ msgstr "Lire la suite" msgid "Featured" msgstr "À la une" -#: templates/index.html:31 templates/index.html.py:39 +#: templates/index.html:34 templates/index.html.py:42 msgid "All" msgstr "Tous les" -#: templates/index.html:31 +#: templates/index.html:34 msgid "articles" msgstr "articles" -#: templates/index.html:47 -#| msgid "All" +#: templates/index.html:50 msgctxt "fem" msgid "All" msgstr "Toutes les" diff --git a/app/templates/agenda/includes/event_metainfo.html b/app/templates/agenda/includes/event_metainfo.html index 1fcc9e7d..886170eb 100644 --- a/app/templates/agenda/includes/event_metainfo.html +++ b/app/templates/agenda/includes/event_metainfo.html @@ -6,12 +6,15 @@ {% if event.end|date == event.start|date and event.end.hour|subtract:event.start.hour > 3 %}{{ event.end|time:"TIME_FORMAT" }}{% endif %} {% if unit_booking %}    |    - {% for price in event.prices.all %}{{ price.value|floatformat:"-2" }} €{% if not forloop.last %} / {% endif %}{% endfor %} {% if event.prices.all.0|floatformat != '0' %} + {% for price in event.prices.all %}{{ price.value|floatformat:"-2" }} €{% if not forloop.last %} / {% endif %}{% endfor %} {% trans "Booking" %} + {% else %} + {% trans "Free entry. Limited seats available" %} {% endif %} + {% endif %} {% endif %} {% if event.location %} diff --git a/lib/mezzanine-agenda b/lib/mezzanine-agenda index 48bf4c82..a9cda676 160000 --- a/lib/mezzanine-agenda +++ b/lib/mezzanine-agenda @@ -1 +1 @@ -Subproject commit 48bf4c82f0a94ff42daf0a0ae496c949a6d4f6cc +Subproject commit a9cda67673604021613b2b0ea1794514e6055c37 -- 2.39.5