From a1deb3c28ffffefb42c249d5bae9d31735e9ac03 Mon Sep 17 00:00:00 2001
From: Harrys Ravalomanana <hra@esokia.com>
Date: Tue, 17 Mar 2020 18:35:36 +0400
Subject: [PATCH] PHRAS-2978 fix date format

---
 lib/Alchemy/Phrasea/Controller/Prod/PushController.php |  2 +-
 lib/classes/phraseadate.php                            | 10 ++++++++++
 templates/web/prod/WorkZone/Basket.html.twig           |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/lib/Alchemy/Phrasea/Controller/Prod/PushController.php b/lib/Alchemy/Phrasea/Controller/Prod/PushController.php
index c1fd5d8751..c9726d5faf 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/PushController.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/PushController.php
@@ -615,7 +615,7 @@ class PushController extends Controller
         $manager->beginTransaction();
         try {
             $basket = $repository->findUserBasket($request->request->get('basket_id'), $this->app->getAuthenticatedUser(), true);
-            $date = new \DateTime($request->request->get('date'));
+            $date = new \DateTime($request->request->get('date') . " 23:59:59");
             $validation = $basket->getValidation();
             if (is_null($validation)) {
                 return $this->app->json($ret);
diff --git a/lib/classes/phraseadate.php b/lib/classes/phraseadate.php
index 6acca8b75f..a9732e7822 100644
--- a/lib/classes/phraseadate.php
+++ b/lib/classes/phraseadate.php
@@ -120,6 +120,16 @@ class phraseadate
         }
     }
 
+    public function getTranslatedDate(DateTime $date = null)
+    {
+        $fmt = new IntlDateFormatter(
+            $this->app['locale'] ?: 'en',
+            NULL, NULL, NULL, NULL, 'dd MMMM yyyy'
+        );
+
+        return $fmt->format($date);
+    }
+
     /**
      *
      * @param  DateTime $date
diff --git a/templates/web/prod/WorkZone/Basket.html.twig b/templates/web/prod/WorkZone/Basket.html.twig
index d46d0f2f55..181382e612 100644
--- a/templates/web/prod/WorkZone/Basket.html.twig
+++ b/templates/web/prod/WorkZone/Basket.html.twig
@@ -99,7 +99,7 @@
             </p>
             <div class="record-number">  {% trans with {'%nb_records%' : nb_records} %}%nb_records% records{% endtrans %}</div>
 
-            {% set dateExpired = app['date-formatter'].getPrettyString(basket.getValidation().getExpires()) %}
+            {% set dateExpired = app['date-formatter'].getTranslatedDate(basket.getValidation().getExpires()) %}
             <div class="expiredDate">
                 {% if date(dateExpired) < date() %}
                     <span>{{ 'workzone:feedback:expiration-closed' | trans }} :</span>