diff --git a/composer.json b/composer.json
index 2b3e2a92e..48948a568 100644
--- a/composer.json
+++ b/composer.json
@@ -100,6 +100,9 @@
},
"drupal/entity_reference_revisions": {
"https://www.drupal.org/project/entity_reference_revisions/issues/2937835": "https://www.drupal.org/files/issues/2021-03-26/entity_reference_revisions-field_formatter_label-2937835-36.patch"
+ },
+ "drupal/datetime_range_timezone": {
+ "https://www.drupal.org/project/datetime_range_timezone/issues/3268321": "https://git.drupalcode.org/project/datetime_range_timezone/-/merge_requests/7.diff"
}
},
"drupal-scaffold": {
diff --git a/modules/oe_theme_content_event/templates/datetime-range-timezone.html.twig b/modules/oe_theme_content_event/templates/datetime-range-timezone.html.twig
index 375ca1aff..52a48a9ac 100644
--- a/modules/oe_theme_content_event/templates/datetime-range-timezone.html.twig
+++ b/modules/oe_theme_content_event/templates/datetime-range-timezone.html.twig
@@ -7,11 +7,17 @@
*/
#}
- {{ start_date }}
+
+
+ {% if separator is not empty %}
{{ separator }}
- {{ end_date }}
+ {% endif %}
+
+ {% if end_date is not empty %}
+
+ {% endif %}
- {% if timezone %}
- {{ timezone }}
- {% endif %}
+ {% if timezone %}
+ {{ timezone }}
+ {% endif %}
diff --git a/tests/src/Functional/ContentEventRenderTest.php b/tests/src/Functional/ContentEventRenderTest.php
index b1b6e3cb9..f37cb7d78 100644
--- a/tests/src/Functional/ContentEventRenderTest.php
+++ b/tests/src/Functional/ContentEventRenderTest.php
@@ -230,7 +230,7 @@ public function testEventRendering(): void {
'size' => 'm',
], [
'icon' => 'calendar',
- 'text' => '27 February 2020, 14:00 UTC - 27 February 2020, 14:00 UTC',
+ 'text' => '27 February 2020, 14:00 UTC',
'size' => 'm',
],
],
@@ -247,7 +247,7 @@ public function testEventRendering(): void {
'items' => [
[
'label' => 'When',
- 'body' => 'Thursday 27 February 2020, 14:00 UTC - Thursday 27 February 2020, 14:00 UTC',
+ 'body' => 'Thursday 27 February 2020, 14:00 UTC',
], [
'label' => 'Languages',
'body' => 'Estonian, French',