From 43aa5749d95df55075b4beb0690917914cca95b1 Mon Sep 17 00:00:00 2001 From: Nicola Saunders Date: Tue, 1 Aug 2023 06:34:53 +0100 Subject: [PATCH 1/3] Relocate event date id and aria-labelledby reference order --- .../components/listings-events.html.twig | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/design-system-templates/components/listings-events.html.twig b/design-system-templates/components/listings-events.html.twig index 557bb4a1..1ad6fc93 100644 --- a/design-system-templates/components/listings-events.html.twig +++ b/design-system-templates/components/listings-events.html.twig @@ -1,6 +1,6 @@
-
+
@@ -14,7 +14,7 @@
-

+

Online

@@ -26,7 +26,7 @@
-
+
@@ -40,7 +40,7 @@
-

+

Online

@@ -57,7 +57,7 @@
-
+
@@ -71,7 +71,7 @@
-

+

Online

@@ -88,7 +88,7 @@
-
+
@@ -103,7 +103,7 @@
-

+

NEC Birmingham, U.K.

From 2471d66e0f960808653acde84ee7839a44c13c2f Mon Sep 17 00:00:00 2001 From: Nicola Saunders Date: Tue, 1 Aug 2023 06:36:46 +0100 Subject: [PATCH 2/3] Remove trailing slashes on img They get flagged by the html validator --- .../components/listings-events.html.twig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/design-system-templates/components/listings-events.html.twig b/design-system-templates/components/listings-events.html.twig index 1ad6fc93..b1560a04 100644 --- a/design-system-templates/components/listings-events.html.twig +++ b/design-system-templates/components/listings-events.html.twig @@ -11,7 +11,7 @@
- +

@@ -37,7 +37,7 @@
- +

@@ -68,7 +68,7 @@
- +

@@ -100,7 +100,7 @@
- +

From 95c3755825a36eeedb2ae3d27b33c76b4771511d Mon Sep 17 00:00:00 2001 From: Jean-Guilhem Rouel Date: Tue, 1 Aug 2023 11:52:59 +0200 Subject: [PATCH 3/3] event labelled by date instead of full date/time/time zone --- src/Twig/TwigExtension.php | 7 +++++-- templates/components/listings/events/entry.html.twig | 2 +- .../w3c_website_templates_bundle+intl-icu.en.yaml | 12 +++++++++--- .../w3c_website_templates_bundle+intl-icu.ja.yaml | 12 +++++++++--- ...3c_website_templates_bundle+intl-icu.zh-hans.yaml | 12 +++++++++--- 5 files changed, 33 insertions(+), 12 deletions(-) diff --git a/src/Twig/TwigExtension.php b/src/Twig/TwigExtension.php index 8b4aa84b..6e672e9c 100644 --- a/src/Twig/TwigExtension.php +++ b/src/Twig/TwigExtension.php @@ -196,7 +196,8 @@ public function dateRange( DateTimeInterface $originalEnd, string $tz, string $locale, - bool $utc = false + bool $utc = false, + string $id = null ): string { if ($locale == 'en') { $locale = 'en-GB'; @@ -232,7 +233,9 @@ public function dateRange( 'end_date' => $endDate, 'end_time' => $endTime, 'timezone' => $timezone, - 'same_day' => $sameDay + 'same_day' => $sameDay, + 'with_id' => $id != null, + 'id' => $id ], 'w3c_website_templates_bundle' ); diff --git a/templates/components/listings/events/entry.html.twig b/templates/components/listings/events/entry.html.twig index 0c37340f..c45d6ab8 100644 --- a/templates/components/listings/events/entry.html.twig +++ b/templates/components/listings/events/entry.html.twig @@ -26,7 +26,7 @@

- {% block event_dates %}{{ date_range(entry.start, entry.end, entry.tz, site.locale)|raw }}{% endblock %} + {% block event_dates %}{{ date_range(entry.start, entry.end, entry.tz, site.locale, false, 'event-' ~ index ~ '-date')|raw }}{% endblock %}

{% block event_location %} {% if entry.location %} diff --git a/translations/w3c_website_templates_bundle+intl-icu.en.yaml b/translations/w3c_website_templates_bundle+intl-icu.en.yaml index 1afc889e..53767d44 100644 --- a/translations/w3c_website_templates_bundle+intl-icu.en.yaml +++ b/translations/w3c_website_templates_bundle+intl-icu.en.yaml @@ -195,9 +195,15 @@ notes: events: # same_day = 1 when start_date == end_date date_range: >- - {same_day, select, - 1 {– {timezone}} - other { – {timezone}} + {with_id, select, + 1 {{same_day, select, + 1 {– {timezone}} + other { – {timezone}} + }} + other {{same_day, select, + 1 {– {timezone}} + other { – {timezone}} + }} } add_to_calendar: Add to calendar event_details: Event details diff --git a/translations/w3c_website_templates_bundle+intl-icu.ja.yaml b/translations/w3c_website_templates_bundle+intl-icu.ja.yaml index 88f6a5e0..7da090c7 100644 --- a/translations/w3c_website_templates_bundle+intl-icu.ja.yaml +++ b/translations/w3c_website_templates_bundle+intl-icu.ja.yaml @@ -178,9 +178,15 @@ notes: events: # same_day = 1 when start_date == end_date date_range: >- - {same_day, select, - 1 {{start_date}, {start_time} - {end_time} {timezone}} - other {{start_date}, {start_time} - {end_date}, {end_time} {timezone}} + {with_id, select, + 1 {{same_day, select, + 1 {– {timezone}} + other { – {timezone}} + }} + other {{same_day, select, + 1 {– {timezone}} + other { – {timezone}} + }} } add_to_calendar: __events.add_to_calendar event_details: __events.event_details diff --git a/translations/w3c_website_templates_bundle+intl-icu.zh-hans.yaml b/translations/w3c_website_templates_bundle+intl-icu.zh-hans.yaml index 81002501..2925a560 100644 --- a/translations/w3c_website_templates_bundle+intl-icu.zh-hans.yaml +++ b/translations/w3c_website_templates_bundle+intl-icu.zh-hans.yaml @@ -191,9 +191,15 @@ notes: events: # same_day = 1 when start_date == end_date date_range: >- - {same_day, select, - 1 {{start_date}, {start_time} - {end_time} {timezone}} - other {{start_date}, {start_time} - {end_date}, {end_time} {timezone}} + {with_id, select, + 1 {{same_day, select, + 1 {– {timezone}} + other { – {timezone}} + }} + other {{same_day, select, + 1 {– {timezone}} + other { – {timezone}} + }} } add_to_calendar: 添加到日历 event_details: 事件详情