From 13111b2a602879ae04025081c46e3d9eb7b89eea Mon Sep 17 00:00:00 2001 From: Jean-Marie Favreau Date: Sat, 5 Oct 2024 18:57:07 +0200 Subject: [PATCH] =?UTF-8?q?Am=C3=A9lioration=20rendu=20=C3=A0=20venir?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/agenda_culturel/calendar.py | 12 +++-- .../locale/fr/LC_MESSAGES/django.po | 46 +++++++++++++------ src/agenda_culturel/static/style.scss | 2 + .../agenda_culturel/page-upcoming.html | 2 +- 4 files changed, 44 insertions(+), 18 deletions(-) diff --git a/src/agenda_culturel/calendar.py b/src/agenda_culturel/calendar.py index aa561c8..fd1354b 100644 --- a/src/agenda_culturel/calendar.py +++ b/src/agenda_culturel/calendar.py @@ -123,8 +123,9 @@ class DayInCalendar: result.append((c.name, self.events_by_category[c.name])) return result - def build_time_intervals(self, all_day_name, interval_names, interval_markers): - self.time_intervals = [IntervalInDay(self.date, i, n) for i, n in enumerate([all_day_name] + interval_names)] + def build_time_intervals(self, all_day_name, all_day_short_name, interval_names, interval_short_names, interval_markers): + self.time_intervals = [IntervalInDay(self.date, i, n[0], n[1]) for i, n in + enumerate(zip([all_day_name] + interval_names, [all_day_short_name] + interval_short_names))] nm2 = datetime.now() + timedelta(hours=-2) for e in self.events: @@ -155,16 +156,19 @@ class DayInCalendar: name = _date(self.date, "l") all_day_name = _('All day %s') % name interval_names = [_('%s morning') % name, _('%s noon') % name, _('%s afternoon') % name, _('%s evening') % name] + all_day_short_name = _('All day') + interval_short_names = [_('Morning'), _('Noon'), _('Afternoon'), _('Evening')] interval_markers = [datetime.combine(self.date, time(h, m)) for h, m in [(11, 30), (13, 0), (18, 0)]] - self.build_time_intervals(all_day_name, interval_names, interval_markers) + self.build_time_intervals(all_day_name, all_day_short_name, interval_names, interval_short_names, interval_markers) return self.time_intervals class IntervalInDay(DayInCalendar): - def __init__(self, d, id, name): + def __init__(self, d, id, name, short_name): self.name = name + self.short_name = short_name super().__init__(d) self.id = self.id + '-' + str(id) diff --git a/src/agenda_culturel/locale/fr/LC_MESSAGES/django.po b/src/agenda_culturel/locale/fr/LC_MESSAGES/django.po index 26ec8ae..3db1bba 100644 --- a/src/agenda_culturel/locale/fr/LC_MESSAGES/django.po +++ b/src/agenda_culturel/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: agenda_culturel\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-10-05 15:12+0200\n" +"POT-Creation-Date: 2024-10-05 18:53+0200\n" "PO-Revision-Date: 2023-10-29 14:16+0000\n" "Last-Translator: Jean-Marie Favreau \n" "Language-Team: Jean-Marie Favreau \n" @@ -17,59 +17,79 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: agenda_culturel/calendar.py:146 +#: agenda_culturel/calendar.py:149 msgid "All day today" msgstr "Aujourd'hui toute la journée" -#: agenda_culturel/calendar.py:147 +#: agenda_culturel/calendar.py:150 msgid "This morning" msgstr "Ce matin" -#: agenda_culturel/calendar.py:147 +#: agenda_culturel/calendar.py:150 msgid "This noon" msgstr "Ce midi" -#: agenda_culturel/calendar.py:147 +#: agenda_culturel/calendar.py:150 msgid "This afternoon" msgstr "Cet après-midi" -#: agenda_culturel/calendar.py:147 +#: agenda_culturel/calendar.py:150 msgid "This evening" msgstr "Ce soir" -#: agenda_culturel/calendar.py:149 +#: agenda_culturel/calendar.py:152 msgid "Tomorrow" msgstr "Demain" -#: agenda_culturel/calendar.py:150 +#: agenda_culturel/calendar.py:153 msgid "All day tomorrow" msgstr "Toute la journée de demain" -#: agenda_culturel/calendar.py:151 agenda_culturel/calendar.py:155 +#: agenda_culturel/calendar.py:154 agenda_culturel/calendar.py:158 #, python-format msgid "%s morning" msgstr "%s matin" -#: agenda_culturel/calendar.py:151 agenda_culturel/calendar.py:155 +#: agenda_culturel/calendar.py:154 agenda_culturel/calendar.py:158 #, python-format msgid "%s noon" msgstr "%s midi" -#: agenda_culturel/calendar.py:151 agenda_culturel/calendar.py:155 +#: agenda_culturel/calendar.py:154 agenda_culturel/calendar.py:158 #, python-format msgid "%s afternoon" msgstr "%s après-midi" -#: agenda_culturel/calendar.py:151 agenda_culturel/calendar.py:155 +#: agenda_culturel/calendar.py:154 agenda_culturel/calendar.py:158 #, python-format msgid "%s evening" msgstr "%s soir" -#: agenda_culturel/calendar.py:154 +#: agenda_culturel/calendar.py:157 #, python-format msgid "All day %s" msgstr "Toute la journée de %s" +#: agenda_culturel/calendar.py:159 +msgid "All day" +msgstr "Toute la journée" + +#: agenda_culturel/calendar.py:160 +msgid "Morning" +msgstr "Matin" + +#: agenda_culturel/calendar.py:160 +msgid "Noon" +msgstr "Midi" + +#: agenda_culturel/calendar.py:160 +msgid "Afternoon" +msgstr "Après-midi" + +#: agenda_culturel/calendar.py:160 +msgid "Evening" +msgstr "Soir" + #: agenda_culturel/forms.py:44 agenda_culturel/models.py:168 #: agenda_culturel/models.py:336 agenda_culturel/models.py:1341 #: agenda_culturel/models.py:1441 diff --git a/src/agenda_culturel/static/style.scss b/src/agenda_culturel/static/style.scss index cc2d9a2..352fe37 100644 --- a/src/agenda_culturel/static/style.scss +++ b/src/agenda_culturel/static/style.scss @@ -1223,6 +1223,8 @@ article { .description { float: left; width: calc(70% - 16em); + max-width: 42em; + margin-bottom: 1em; } .illustration { width: 14em; diff --git a/src/agenda_culturel/templates/agenda_culturel/page-upcoming.html b/src/agenda_culturel/templates/agenda_culturel/page-upcoming.html index c0e9f7e..b9f11fe 100644 --- a/src/agenda_culturel/templates/agenda_culturel/page-upcoming.html +++ b/src/agenda_culturel/templates/agenda_culturel/page-upcoming.html @@ -56,7 +56,7 @@
{% for ti in cd.get_time_intervals %} {% if ti.events|length > 0 %} -

{{ ti.name }} {% picto_from_name "chevron-down" %}

+

{{ ti.short_name }} {% picto_from_name "chevrons-down" %}

    {% for event in ti.events %}
  • {{ event.category | circle_cat:event.has_recurrences }}