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

Merge pull request #3424 from alchemy-fr/PHRAS-2992

Browse Source 
PHRAS-2992 #comment merge of Prod Fix Date translation everywhere record history.
This commit is contained in:
Nicolas Maillat
2020-04-02 12:21:50 +02:00
committed by GitHub
parent 32ec5da4a8 3767c75b0a
commit c42e419ad2
1 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
lib/classes/phraseadate.php
View File

@@ -149,17 +149,25 @@ class phraseadate
*/ */
private function formatDate(DateTime $date, $locale, $format) private function formatDate(DateTime $date, $locale, $format)
{ {
switch ($locale) { switch ($locale) {
default: default:
case 'de':
case 'fr': case 'fr':
switch ($format) { switch ($format) {
default: default:
case 'DAY_MONTH': case 'DAY_MONTH':
$date_formated = strftime("%e %B", $date->format('U')); $formatM = new IntlDateFormatter(
$locale,
NULL, NULL, NULL, NULL, 'dd MMMM'
);
$date_formated = $formatM->format($date);
break; break;
case 'DAY_MONTH_YEAR': case 'DAY_MONTH_YEAR':
$date_formated = strftime("%e %B %Y", $date->format('U')); $formatY = new IntlDateFormatter(
$locale,
NULL, NULL, NULL, NULL, 'dd MMMM yyyy'
);
$date_formated = $formatY->format($date);
break; break;
} }
break; break;
@@ -167,26 +175,22 @@ class phraseadate
switch ($format) { switch ($format) {
default: default:
case 'DAY_MONTH': case 'DAY_MONTH':
$date_formated = strftime("%B %e", $date->format('U')); $formatM = new IntlDateFormatter(
$locale,
NULL, NULL, NULL, NULL, 'MMMM dd'
);
$date_formated = $formatM->format($date);
break; break;
case 'DAY_MONTH_YEAR': case 'DAY_MONTH_YEAR':
$date_formated = strftime("%B %e %Y", $date->format('U')); $formatY = new IntlDateFormatter(
break; $locale,
} NULL, NULL, NULL, NULL, 'MMMM dd yyyy'
break; );
case 'de': $date_formated = $formatY->format($date);
switch ($format) {
default:
case 'DAY_MONTH':
$date_formated = strftime("%e. %B", $date->format('U'));
break;
case 'DAY_MONTH_YEAR':
$date_formated = strftime("%e. %B %Y", $date->format('U'));
break; break;
} }
break; break;
} }
return $date_formated; return $date_formated;
} }