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

language specific money and date display (#180)

Browse Source 
* improved date translation
* language specific date and money display
This commit is contained in:
Kevin Papst
2018-06-25 16:41:12 +02:00
committed by Simon Schaufelberger
parent f563e0703d
commit d4a46cf257
14 changed files with 308 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
tests/Twig/DateExtensionsTest.php Normal file
View File

@@ -0,0 +1,96 @@
<?php
/*
* This file is part of the Kimai time-tracking app.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace App\Tests\Twig;
use App\Twig\DateExtensions;
use PHPUnit\Framework\TestCase;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\RequestStack;
use Twig\TwigFilter;
/**
* @covers \App\Twig\DateExtensions
*/
class DateExtensionsTest extends TestCase
{
/**
* @param string $locale
* @param array $dateSettings
* @return DateExtensions
*/
protected function getSut($locale, array $dateSettings)
{
$request = new Request();
$request->setLocale($locale);
$requestStack = new RequestStack();
$requestStack->push($request);
return new DateExtensions($requestStack, $dateSettings);
}
public function testGetFilters()
{
$filters = ['month_name', 'date_short'];
$sut = $this->getSut('de', []);
$twigFilters = $sut->getFilters();
$this->assertCount(count($filters), $twigFilters);
$i = 0;
foreach ($twigFilters as $filter) {
$this->assertInstanceOf(TwigFilter::class, $filter);
$this->assertEquals($filters[$i++], $filter->getName());
}
}
/**
* @param string $locale
* @param \DateTime $date
* @param string $result
* @dataProvider getDateShortData
*/
public function testDateShort($locale, \DateTime $date, $result)
{
$sut = $this->getSut($locale, [
'de' => ['date_short' => 'd.m.Y'],
'en' => ['date_short' => 'Y-m-d'],
'ru' => ['date_short' => 'd.m.Y'],
]);
$this->assertEquals($result, $sut->dateShort($date));
}
public function getDateShortData()
{
return [
['en', new \DateTime('7 January 2010'), '2010-01-07'],
['en', new \DateTime('2016-06-23'), '2016-06-23'],
['de', new \DateTime('1980-12-14'), '14.12.1980'],
['ru', new \DateTime('1980-12-14'), '14.12.1980'],
];
}
/**
* @param \DateTime $date
* @param string $result
* @dataProvider getMonthData
*/
public function testMonthName(\DateTime $date, $result)
{
$sut = $this->getSut('en', []);
$this->assertEquals($result, $sut->monthName($date));
}
public function getMonthData()
{
return [
[new \DateTime('January 2016'), 'month.1'],
[new \DateTime('2016-06-23'), 'month.6'],
[new \DateTime('2016-12-23'), 'month.12'],
];
}
}

68
tests/Twig/ExtensionsTest.php
View File

@@ -12,6 +12,8 @@ namespace App\Tests\Twig;
use App\Entity\Timesheet;
use App\Twig\Extensions;
use PHPUnit\Framework\TestCase;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\RequestStack;
use Twig\TwigFilter;
/**
@@ -19,10 +21,25 @@ use Twig\TwigFilter;
*/
class ExtensionsTest extends TestCase
{
/**
* @param string $locales
* @param string $locale
* @return Extensions
*/
protected function getSut($locales, $locale = 'en')
{
$request = new Request();
$request->setLocale($locale);
$requestStack = new RequestStack();
$requestStack->push($request);
return new Extensions($requestStack, $locales);
}
public function testGetFilters()
{
$filters = ['duration', 'money', 'currency', 'country'];
$sut = new Extensions('de');
$sut = $this->getSut('de');
$twigFilters = $sut->getFilters();
$this->assertCount(count($filters), $twigFilters);
$i = 0;
@@ -35,7 +52,7 @@ class ExtensionsTest extends TestCase
public function testGetFunctions()
{
$functions = ['locales'];
$sut = new Extensions('de');
$sut = $this->getSut('de');
$twigFunctions = $sut->getFunctions();
$this->assertCount(count($functions), $twigFunctions);
$i = 0;
@@ -53,7 +70,7 @@ class ExtensionsTest extends TestCase
['code' => 'ru', 'name' => 'русский'],
];
$sut = new Extensions('en|de|ru');
$sut = $this->getSut('en|de|ru');
$this->assertEquals($locales, $sut->getLocales());
}
@@ -65,7 +82,7 @@ class ExtensionsTest extends TestCase
'RUB' => 'RUB',
];
$sut = new Extensions('en');
$sut = $this->getSut('en');
foreach ($symbols as $name => $symbol) {
$this->assertEquals($symbol, $sut->currency($name));
}
@@ -79,33 +96,48 @@ class ExtensionsTest extends TestCase
'ES' => 'Spain',
];
$sut = new Extensions('en');
$sut = $this->getSut('en');
foreach ($countries as $locale => $name) {
$this->assertEquals($name, $sut->country($locale));
}
}
public function testMoney()
/**
* @param string $result
* @param int $amount
* @param string $currency
* @param string $locale
* @dataProvider getMoneyData
*/
public function testMoney($result, $amount, $currency, $locale)
{
$money = [
[2222, 'EUR', '2,222.00 €'],
[13.75, 'USD', '13.75 $'],
];
$sut = $this->getSut('en', $locale);
$this->assertEquals($result, $sut->money($amount, $currency));
}
$sut = new Extensions('en');
foreach ($money as $entry) {
$amount = $entry[0];
$currency = $entry[1];
$expected = $entry[2];
$this->assertEquals($expected, $sut->money($amount, $currency));
}
public function getMoneyData()
{
return [
['2,345 €', 2345, 'EUR', 'en'],
['2,345 €', 2345, 'EUR', 'en'],
['2.345,01 €', 2345.009, 'EUR', 'de'],
['2.345,01 €', 2345.009, 'EUR', 'de'],
['13.75 $', 13.75, 'USD', 'en'],
['13,75 $', 13.75, 'USD', 'de'],
['13,75 RUB', 13.75, 'RUB', 'de'],
['13,5 RUB', 13.50, 'RUB', 'de'],
['13,75 ₽', 13.75, 'RUB', 'ru'],
['14 ¥', 13.75, 'JPY', 'de'],
['13 933 ¥', 13933.49, 'JPY', 'ru'],
['1.234.567,89 $', 1234567.891234567890000, 'USD', 'de'],
];
}
public function testDuration()
{
$record = $this->getTimesheet(9437);
$sut = new Extensions('en');
$sut = $this->getSut('en');
$this->assertEquals('02:37 h', $sut->duration($record->getDuration()));
$this->assertEquals('02:37:17 h', $sut->duration($record->getDuration(), true));