diff --git a/src/patterns/04-components/card/card-elements/_date.twig b/src/patterns/04-components/card/card-elements/_date.twig index 561865955f98335b0eb1aec442a9806e46116d1e..6ca76cd414227c7fbdd77524d42222d73ced4593 100644 --- a/src/patterns/04-components/card/card-elements/_date.twig +++ b/src/patterns/04-components/card/card-elements/_date.twig @@ -15,17 +15,19 @@ <div> <span class="uw-date__agenda-time"> {% if d.all_day %} - All day + {{ d['translated']['all_day'] }} {% else %} {% include '@components/date/_date.twig' with { 'date_format': 'agenda-time', 'date': d.start_date, + 'translated': d['translated']['start_date'][date_format] ?? null, 'timezone': false, } %} {# Agenda item end Time #} - {% include '@components/date/_date.twig' with { 'date_format': 'agenda-time', 'date': d.end_date, + 'translated': d['translated']['end_date'][date_format] ?? null, 'timezone': false, } %} {% endif %} @@ -50,24 +52,28 @@ {% include '@components/date/_date.twig' with { 'date_format': 'long', 'date': d.start_date, + 'translated': d['translated']['start_date']['long'] ?? null, 'timezone': d.timezone, - } %} (all day) + } %} ({% if d['translated']['all_day'] %}{{ d['translated']['all_day'] }}{% else %}all day{% endif %}) {% else %} {% include '@components/date/_date.twig' with { 'date_format': 'long_with_time', 'date': d.start_date, + 'translated': d['translated']['start_date']['long_with_time'] ?? null, 'timezone': d.timezone, } %} - {% include '@components/date/_date.twig' with { 'date_format': 'time_only', 'date': d.end_date, + 'translated': d['translated']['end_date']['time_only'] ?? null, 'timezone': d.timezone, } %} {% include '@components/date/_date.twig' with { 'date_format': 'timezone', 'date': d.start_date, + 'translated': d['translated']['start_date']['timezone'] ?? null, 'timezone': d.timezone, } %} {% endif %} @@ -77,30 +83,35 @@ {% include '@components/date/_date.twig' with { 'date_format': 'long', 'date': d.start_date, + 'translated': d['translated']['start_date']['long'] ?? null, 'timezone': d.timezone, } %} - {% include '@components/date/_date.twig' with { 'date_format': 'long', 'date': d.end_date, + 'translated': d['translated']['end_date']['long'] ?? null, 'timezone': d.timezone, - } %} (all day) + } %} ({% if d['translated']['all_day'] %}{{ d['translated']['all_day'] }}{% else %}all day{% endif %}) {% else %} {% include '@components/date/_date.twig' with { 'date_format': 'long_with_time', 'date': d.start_date, + 'translated': d['translated']['start_date']['long_with_time'] ?? null, 'timezone': d.timezone, } %} - {% include '@components/date/_date.twig' with { 'date_format': 'long_with_time', 'date': d.end_date, + 'translated': d['translated']['end_date']['long_with_time'] ?? null, 'timezone': d.timezone, } %} {% include '@components/date/_date.twig' with { 'date_format': 'timezone', 'date': d.start_date, + 'translated': d['translated']['start_date']['timezone'] ?? null, 'timezone': d.timezone, } %} {% endif %} @@ -110,6 +121,7 @@ {% include '@components/date/_date.twig' with { 'date_format': date_format, 'date': d.date, + 'translated': d['translated'][date_format] ?? null, 'timezone': d.timezone, } %} {% endif %} diff --git a/src/patterns/04-components/date/_date.twig b/src/patterns/04-components/date/_date.twig index 2e0b7ecdab88552872a1c3f9317a4eb4d36e5a55..545e1ef7bfc9f4807c67b92debd6193575ac0cc3 100644 --- a/src/patterns/04-components/date/_date.twig +++ b/src/patterns/04-components/date/_date.twig @@ -3,33 +3,65 @@ {% endif %} {% if date_format == 'long' %} - {{ date|date('l, F j, Y', timezone) }} + {% if translated %} + {{ translated }} + {% else %} + {{ date|date('l, F j, Y', timezone) }} + {% endif %} {% endif %} {% if date_format == 'standard' %} - {{ date|date('F j, Y', timezone) }} + {% if translated %} + {{ translated }} + {% else %} + {{ date|date('F j, Y', timezone) }} + {% endif %} {% endif %} {% if date_format == 'agenda-date' %} - {{ date|date('M j', timezone) }} + {% if translated %} + {{ translated }} + {% else %} + {{ date|date('M j', timezone) }} + {% endif %} {% endif %} {% if date_format == 'agenda-time' %} - {{ date|date('g:i a', timezone) }} + {% if translated %} + {{ translated }} + {% else %} + {{ date|date('g:i a', timezone) }} + {% endif %} {% endif %} {% if date_format == 'long_with_time' %} - {{ date|date('l, F j, Y g:i a', timezone) }} + {% if translated %} + {{ translated }} + {% else %} + {{ date|date('l, F j, Y g:i a', timezone) }} + {% endif %} {% endif %} {% if date_format == 'time_only' %} - {{ date|date('g:i a', timezone) }} + {% if translated %} + {{ translated }} + {% else %} + {{ date|date('g:i a', timezone) }} + {% endif %} {% endif %} {% if date_format == 'timezone' %} - {{ date|date('T (\\G\\M\\T P)', timezone) }} + {% if translated %} + {{ translated }} + {% else %} + {{ date|date('T (\\G\\M\\T P)', timezone) }} + {% endif %} {% endif %} {% if date_format == 'month_only' %} - {{ date|date('F Y', timezone) }} + {% if translated %} + {{ translated }} + {% else %} + {{ date|date('F Y', timezone) }} + {% endif %} {% endif %}