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

Release 2.52 (#5874)

Browse Source
This commit is contained in:
Kevin Papst
2026-03-16 17:44:12 +01:00
committed by GitHub
parent 70b4fbcae8
commit cad9f58703
9 changed files with 161 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Constants.php
View File

@@ -17,11 +17,11 @@ final class Constants
/**
* The current release version
*/
public const VERSION = '2.51.0';
public const VERSION = '2.52.0';
/**
* The current release: major * 10000 + minor * 100 + patch
*/
public const VERSION_ID = 25100;
public const VERSION_ID = 25200;
/**
* The software name
*/

6
src/Twig/LocaleFormatExtensions.php
View File

@@ -44,7 +44,7 @@ final class LocaleFormatExtensions extends AbstractExtension implements LocaleAw
// cannot be deleted right now, needs to be kept for invoice and export templates
new TwigFilter('date_full', [$this, 'dateTime'], ['deprecation_info' => new DeprecatedCallableInfo('Kimai', '2.0', 'date_time')]),
new TwigFilter('date_format', [$this, 'dateFormat']),
new TwigFilter('date_weekday', [$this, 'dateWeekday']),
new TwigFilter('date_weekday', [$this, 'dateWeekday'], ['is_safe' => ['html']]),
new TwigFilter('time', [$this, 'time']),
new TwigFilter('duration', [$this, 'duration']),
new TwigFilter('chart_duration', [$this, 'durationChart']),
@@ -144,9 +144,9 @@ final class LocaleFormatExtensions extends AbstractExtension implements LocaleAw
return (string) $this->getFormatter()->dateFormat($date, $format);
}
public function dateWeekday(\DateTimeInterface $date): string
public function dateWeekday(\DateTimeInterface $date, string $spacer = ' '): string
{
return $this->dayName($date, true) . ' ' . $this->getFormatter()->dateFormat($date, 'd');
return $this->dayName($date, true) . $spacer . $this->getFormatter()->dateFormat($date, 'd');
}
public function time(\DateTimeInterface|string|null $date): string