From ce781a5b587859b333d11b671e3bc48ca93b3a68 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 28 Aug 2024 16:27:04 +0200
Subject: [PATCH] Translate datetime object with icu: split date and time

Translate datetime within icu format
---
 src/Bundle/ChillMainBundle/Controller/WorkflowController.php   | 1 +
 .../Resources/views/Workflow/_signature.html.twig              | 2 +-
 .../ChillMainBundle/translations/messages+intl-icu.fr.yaml     | 3 +++
 src/Bundle/ChillMainBundle/translations/messages.fr.yml        | 1 -
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Controller/WorkflowController.php b/src/Bundle/ChillMainBundle/Controller/WorkflowController.php
index 5d78103b8..eb72c2624 100644
--- a/src/Bundle/ChillMainBundle/Controller/WorkflowController.php
+++ b/src/Bundle/ChillMainBundle/Controller/WorkflowController.php
@@ -387,6 +387,7 @@ class WorkflowController extends AbstractController
                 'notice',
                 $this->translator->trans('workflow.signature_zone.already_signed_alert')
             );
+
             return $this->redirectToRoute('chill_main_workflow_show', ['id' => $signature->getStep()->getEntityWorkflow()->getId()]);
         }
 
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/_signature.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_signature.html.twig
index e439f2268..a2a4129f1 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Workflow/_signature.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_signature.html.twig
@@ -7,7 +7,7 @@
             <div class="col-sm-12 col-md-4">
                 <ul class="record_actions">
                     {% if s.isSigned %}
-                        <p>{{ 'workflow.signature_zone.has_signed_statement'|trans( { '%datetime%' : s.stateDate|date('j M Y à H:i:s') } ) }}</p>
+                        <p>{{ 'workflow.signature_zone.has_signed_statement'|trans({ 'datetime' : s.stateDate }) }}</p>
                     {% else %}
                         <li>
                             <a class="btn btn-misc" href="{{ chill_path_add_return_path('chill_main_workflow_signature_metadata', { 'signature_id': s.id}) }}"><i class="fa fa-pencil-square-o"></i> {{ 'workflow.signature_zone.button_sign'|trans }}</a>
diff --git a/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml b/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml
index 96b2edd98..a0753f7a6 100644
--- a/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml
+++ b/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml
@@ -45,6 +45,9 @@ workflow:
             few {# workflows}
             other {# workflows}
         }
+    signature_zone:
+        has_signed_statement: 'A signé le {datetime, date, short} à {datetime, time, short}'
+
 
 duration:
     minute: >-
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index e442f38aa..f6f30bcd0 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -531,7 +531,6 @@ workflow:
     signature_zone:
         title: Appliquer les signatures électroniques
         button_sign: Signer
-        has_signed_statement: 'À signé le %datetime%'
         metadata:
             sign_by: 'Signature pour %name%'
             docType: Type de document