diff --git a/Resources/views/Activity/list.html.twig b/Resources/views/Activity/list.html.twig index 0e1f2afce..62dc2887d 100644 --- a/Resources/views/Activity/list.html.twig +++ b/Resources/views/Activity/list.html.twig @@ -42,7 +42,7 @@ {% for activity in activities %} - {% if activity.date %}{{ activity.date|format_date('long', 'none') }}{% endif %} + {% if activity.date %}{{ activity.date|format_date('long') }}{% endif %} {{ activity.durationTime|date('H:i') }} {% if activity.remark is not empty %} diff --git a/Resources/views/Activity/show.html.twig b/Resources/views/Activity/show.html.twig index aef642a59..01237c275 100644 --- a/Resources/views/Activity/show.html.twig +++ b/Resources/views/Activity/show.html.twig @@ -20,7 +20,7 @@
{{ entity.person }}
{{ 'Date'|trans }}
-
{{ entity.date|format_date('long', 'none') }}
+
{{ entity.date|format_date('long') }}
{{ 'Duration Time'|trans }}
{{ entity.durationTime|date('H:i') }}
{{ 'Type'|trans }}
diff --git a/Resources/views/Timeline/activity_person_context.html.twig b/Resources/views/Timeline/activity_person_context.html.twig index d9ffccebb..fd855a417 100644 --- a/Resources/views/Timeline/activity_person_context.html.twig +++ b/Resources/views/Timeline/activity_person_context.html.twig @@ -1,13 +1,13 @@ {% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
-

{{ activity.date|format_date('long', 'none') }} / {{ 'Activity'|trans }}

+

{{ activity.date|format_date('long') }} / {{ 'Activity'|trans }}

{{ '%user% has done an %activity_type%'|trans( { '%user%' : user, '%activity_type%': activity.type.name|localize_translatable_string, - '%date%' : activity.date|format_date('long', 'none') } + '%date%' : activity.date|format_date('long') } ) }}