From: Emilie Date: Thu, 17 Nov 2016 15:08:15 +0000 (+0100) Subject: Event : correctin EN date X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=20d1cc9d59f6de5d5461e4f66145d087fbe168dc;p=mezzo.git Event : correctin EN date --- diff --git a/app/locale/fr/LC_MESSAGES/django.mo b/app/locale/fr/LC_MESSAGES/django.mo index 36d8a274..b59060d3 100644 Binary files a/app/locale/fr/LC_MESSAGES/django.mo and b/app/locale/fr/LC_MESSAGES/django.mo differ 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" }}