hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

PHRAS-2978 fix date format

Browse Source
This commit is contained in:
Harrys Ravalomanana
2020-03-17 18:35:36 +04:00
parent 5e8dda54a5
commit a1deb3c28f
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Alchemy/Phrasea/Controller/Prod/PushController.php
View File

@@ -615,7 +615,7 @@ class PushController extends Controller
$manager->beginTransaction(); $manager->beginTransaction();
try { try {
$basket = $repository->findUserBasket($request->request->get('basket_id'), $this->app->getAuthenticatedUser(), true); $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(); $validation = $basket->getValidation();
if (is_null($validation)) { if (is_null($validation)) {
return $this->app->json($ret); return $this->app->json($ret);

10
lib/classes/phraseadate.php
View File

@@ -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 * @param DateTime $date

2
templates/web/prod/WorkZone/Basket.html.twig
View File

@@ -99,7 +99,7 @@
</p> </p>
<div class="record-number"> {% trans with {'%nb_records%' : nb_records} %}%nb_records% records{% endtrans %}</div> <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"> <div class="expiredDate">
{% if date(dateExpired) < date() %} {% if date(dateExpired) < date() %}
<span>{{ 'workzone:feedback:expiration-closed' | trans }} :</span> <span>{{ 'workzone:feedback:expiration-closed' | trans }} :</span>