jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

added support for Ante meridiem and Post meridiem format (#615)

Browse Source
This commit is contained in:
Kevin Papst
2019-03-06 10:59:31 +01:00
committed by GitHub
parent e260dd84ad
commit 54cd30c564
14 changed files with 114 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/Twig/DateExtensions.php
View File

@@ -19,9 +19,25 @@ use Twig\TwigFilter;
class DateExtensions extends \Twig_Extension
{
/**
* @var LocaleSettings
* @var LocaleSettings|null
*/
protected $localeSettings;
protected $localeSettings = null;
/**
* @var string
*/
protected $dateFormat = null;
/**
* @var string
*/
protected $dateTimeFormat = null;
/**
* @var string
*/
protected $timeFormat = null;
/**
* @var bool
*/
protected $isTwentyFourHour = null;
/**
* @param LocaleSettings $localeSettings
@@ -42,6 +58,7 @@ class DateExtensions extends \Twig_Extension
new TwigFilter('date_time', [$this, 'dateTime']),
new TwigFilter('date_format', [$this, 'dateFormat']),
new TwigFilter('time', [$this, 'time']),
new TwigFilter('hour24', [$this, 'hour24']),
];
}
@@ -51,9 +68,11 @@ class DateExtensions extends \Twig_Extension
*/
public function dateShort(DateTime $date)
{
$format = $this->localeSettings->getDateFormat();
if (null === $this->dateFormat) {
$this->dateFormat = $this->localeSettings->getDateFormat();
}
return date_format($date, $format);
return date_format($date, $this->dateFormat);
}
/**
@@ -62,9 +81,11 @@ class DateExtensions extends \Twig_Extension
*/
public function dateTime(DateTime $date)
{
$format = $this->localeSettings->getDateTimeFormat();
if (null === $this->dateTimeFormat) {
$this->dateTimeFormat = $this->localeSettings->getDateTimeFormat();
}
return date_format($date, $format);
return date_format($date, $this->dateTimeFormat);
}
/**
@@ -83,7 +104,11 @@ class DateExtensions extends \Twig_Extension
*/
public function time(DateTime $date)
{
return date_format($date, 'H:i');
if (null === $this->timeFormat) {
$this->timeFormat = $this->localeSettings->getTimeFormat();
}
return date_format($date, $this->timeFormat);
}
/**
@@ -94,4 +119,22 @@ class DateExtensions extends \Twig_Extension
{
return 'month.' . $date->format('n');
}
/**
* @param mixed $twentyFour
* @param mixed $twelveHour
* @return mixed
*/
public function hour24($twentyFour, $twelveHour)
{
if (null === $this->isTwentyFourHour) {
$this->isTwentyFourHour = $this->localeSettings->isTwentyFourHours();
}
if (true === $this->isTwentyFourHour) {
return $twentyFour;
}
return $twelveHour;
}
}