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

use configured language for non-twig invoice templates (#1924)

Browse Source
This commit is contained in:
Kevin Papst
2020-08-26 23:41:47 +02:00
committed by GitHub
parent 8464cd925e
commit d25bcfe29c
14 changed files with 531 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

134
src/Twig/DateExtensions.php
View File

@@ -12,6 +12,7 @@ namespace App\Twig;
use App\Configuration\LanguageFormattings;
use App\Constants;
use App\Utils\LocaleFormats;
use App\Utils\LocaleFormatter;
use DateTime;
use Symfony\Component\HttpFoundation\RequestStack;
use Twig\Extension\AbstractExtension;
@@ -29,29 +30,9 @@ class DateExtensions extends AbstractExtension
*/
protected $localeFormats = null;
/**
* @var string
* @var LocaleFormatter
*/
protected $dateFormat = null;
/**
* @var string
*/
protected $dateTimeFormat = null;
/**
* @var string
*/
protected $dateTimeTypeFormat = null;
/**
* @var string
*/
protected $timeFormat = null;
/**
* @var bool
*/
protected $isTwentyFourHour = null;
/**
* @var string
*/
private $locale;
private $formatter;
/**
* @var LanguageFormattings
*/
@@ -118,7 +99,7 @@ class DateExtensions extends AbstractExtension
*/
public function setLocale(string $locale)
{
$this->locale = $locale;
$this->formatter = new LocaleFormatter($this->formats, $locale);
$this->localeFormats = new LocaleFormats($this->formats, $locale);
}
@@ -128,19 +109,7 @@ class DateExtensions extends AbstractExtension
*/
public function dateShort($date)
{
if (null === $this->dateFormat) {
$this->dateFormat = $this->localeFormats->getDateFormat();
}
if (!$date instanceof DateTime) {
try {
$date = new DateTime($date);
} catch (\Exception $ex) {
return $date;
}
}
return $date->format($this->dateFormat);
return $this->formatter->dateShort($date);
}
/**
@@ -149,19 +118,7 @@ class DateExtensions extends AbstractExtension
*/
public function dateTime($date)
{
if (null === $this->dateTimeFormat) {
$this->dateTimeFormat = $this->localeFormats->getDateTimeFormat();
}
if (!$date instanceof DateTime) {
try {
$date = new DateTime($date);
} catch (\Exception $ex) {
return $date;
}
}
return $date->format($this->dateTimeFormat);
return $this->formatter->dateTime($date);
}
/**
@@ -170,28 +127,7 @@ class DateExtensions extends AbstractExtension
*/
public function dateTimeFull($date)
{
if (null === $this->dateTimeTypeFormat) {
$this->dateTimeTypeFormat = $this->localeFormats->getDateTimeTypeFormat();
}
if (!$date instanceof DateTime) {
try {
$date = new DateTime($date);
} catch (\Exception $ex) {
return $date;
}
}
$formatter = new \IntlDateFormatter(
$this->locale,
\IntlDateFormatter::MEDIUM,
\IntlDateFormatter::MEDIUM,
date_default_timezone_get(),
\IntlDateFormatter::GREGORIAN,
$this->dateTimeTypeFormat
);
return $formatter->format($date);
return $this->formatter->dateTimeFull($date);
}
/**
@@ -202,15 +138,7 @@ class DateExtensions extends AbstractExtension
*/
public function dateFormat($date, string $format)
{
if (!$date instanceof DateTime) {
try {
$date = new DateTime($date);
} catch (\Exception $ex) {
return $date;
}
}
return $date->format($format);
return $this->formatter->dateFormat($date, $format);
}
/**
@@ -219,47 +147,17 @@ class DateExtensions extends AbstractExtension
*/
public function time($date)
{
if (null === $this->timeFormat) {
$this->timeFormat = $this->localeFormats->getTimeFormat();
}
if (!$date instanceof DateTime) {
$date = new DateTime($date);
}
return $date->format($this->timeFormat);
}
/**
* @see https://framework.zend.com/manual/1.12/en/zend.date.constants.html#zend.date.constants.selfdefinedformats
* @see http://userguide.icu-project.org/formatparse/datetime
*
* @param DateTime $dateTime
* @param string $format
* @return string
*/
private function formatIntl(\DateTime $dateTime, string $format): string
{
$formatter = new \IntlDateFormatter(
$this->locale,
\IntlDateFormatter::FULL,
\IntlDateFormatter::FULL,
$dateTime->getTimezone()->getName(),
\IntlDateFormatter::GREGORIAN,
$format
);
return $formatter->format($dateTime);
return $this->formatter->time($date);
}
public function monthName(\DateTime $dateTime, bool $withYear = false): string
{
return $this->formatIntl($dateTime, ($withYear ? 'LLLL yyyy' : 'LLLL'));
return $this->formatter->monthName($dateTime, $withYear);
}
public function dayName(\DateTime $dateTime, bool $short = false): string
{
return $this->formatIntl($dateTime, ($short ? 'EE' : 'EEEE'));
return $this->formatter->dayName($dateTime, $short);
}
/**
@@ -269,15 +167,7 @@ class DateExtensions extends AbstractExtension
*/
public function hour24($twentyFour, $twelveHour)
{
if (null === $this->isTwentyFourHour) {
$this->isTwentyFourHour = $this->localeFormats->isTwentyFourHours();
}
if (true === $this->isTwentyFourHour) {
return $twentyFour;
}
return $twelveHour;
return $this->formatter->hour24($twentyFour, $twelveHour);
}
/**

79
src/Twig/LocaleExtensions.php
View File

@@ -13,8 +13,7 @@ use App\Configuration\LanguageFormattings;
use App\Constants;
use App\Entity\Timesheet;
use App\Utils\Duration;
use App\Utils\LocaleFormats;
use App\Utils\LocaleHelper;
use App\Utils\LocaleFormatter;
use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\Intl\Locales;
use Twig\Extension\AbstractExtension;
@@ -27,17 +26,9 @@ use Twig\TwigFunction;
final class LocaleExtensions extends AbstractExtension
{
/**
* @var LocaleFormats
* @var LocaleFormatter
*/
private $localeFormats;
/**
* @var Duration
*/
private $durationFormatter;
/**
* @var LocaleHelper
*/
private $helper;
private $formatter;
/**
* @var LanguageFormattings
*/
@@ -52,7 +43,6 @@ final class LocaleExtensions extends AbstractExtension
$locale = $requestStack->getMasterRequest()->getLocale();
}
$this->durationFormatter = new Duration();
$this->formats = $formats;
$this->setLocale($locale);
}
@@ -90,66 +80,30 @@ final class LocaleExtensions extends AbstractExtension
*/
public function setLocale(string $locale)
{
$this->helper = new LocaleHelper($locale);
$this->localeFormats = new LocaleFormats($this->formats, $locale);
$this->formatter = new LocaleFormatter($this->formats, $locale);
}
/**
* Transforms seconds into a duration string.
*
* @param int|Timesheet $duration
* @param int|Timesheet|null $duration
* @param bool $decimal
* @return string
*/
public function duration($duration, $decimal = false)
{
if ($decimal) {
return $this->durationDecimal($duration);
}
$seconds = $this->getSecondsForDuration($duration);
$format = $this->localeFormats->getDurationFormat();
return $this->formatDuration($seconds, $format);
return $this->formatter->duration($duration, $decimal);
}
/**
* Transforms seconds into a decimal formatted duration string.
*
* @param int|Timesheet $duration
* @param int|Timesheet|null $duration
* @return string
*/
public function durationDecimal($duration)
{
$seconds = $this->getSecondsForDuration($duration);
return $this->helper->durationDecimal($seconds);
}
private function getSecondsForDuration($duration): int
{
if (null === $duration) {
$duration = 0;
}
if ($duration instanceof Timesheet) {
if (null === $duration->getEnd()) {
$duration = time() - $duration->getBegin()->getTimestamp();
} else {
$duration = $duration->getDuration();
}
}
return (int) $duration;
}
private function formatDuration(int $seconds, string $format): string
{
if ($seconds < 0) {
return '?';
}
return $this->durationFormatter->format($seconds, $format);
return $this->formatter->durationDecimal($duration);
}
/**
@@ -158,7 +112,7 @@ final class LocaleExtensions extends AbstractExtension
*/
public function amount($amount)
{
return $this->helper->amount($amount);
return $this->formatter->amount($amount);
}
/**
@@ -169,7 +123,7 @@ final class LocaleExtensions extends AbstractExtension
*/
public function currency($currency)
{
return $this->helper->currency($currency);
return $this->formatter->currency($currency);
}
/**
@@ -178,7 +132,7 @@ final class LocaleExtensions extends AbstractExtension
*/
public function language($language)
{
return $this->helper->language($language);
return $this->formatter->language($language);
}
/**
@@ -187,7 +141,7 @@ final class LocaleExtensions extends AbstractExtension
*/
public function country($country)
{
return $this->helper->country($country);
return $this->formatter->country($country);
}
/**
@@ -198,7 +152,7 @@ final class LocaleExtensions extends AbstractExtension
*/
public function money($amount, ?string $currency = null, bool $withCurrency = true)
{
return $this->helper->money($amount, $currency, $withCurrency);
return $this->formatter->money($amount, $currency, $withCurrency);
}
/**
@@ -210,11 +164,6 @@ final class LocaleExtensions extends AbstractExtension
*/
public function getLocales()
{
$locales = [];
foreach ($this->localeFormats->getAvailableLanguages() as $locale) {
$locales[] = ['code' => $locale, 'name' => Locales::getName($locale, $locale)];
}
return $locales;
return $this->formatter->getLocales();
}
}