Skip to content
Snippets Groups Projects
Commit d8d7ba97 authored by Igor Biki's avatar Igor Biki
Browse files

Merge branch 'feature/ISTWCMS-7156-ebremner-public-facing-dates' into '1.1.x'

ISTWCMS-7156: update templates to use translated dates

See merge request !244
parents 100e4ee8 98e49d3a
No related branches found
No related tags found
1 merge request!244ISTWCMS-7156: update templates to use translated dates
......@@ -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 %}
......
......@@ -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 %}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment