tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6885 from open-sausages/pulls/4.0/fix-intl-test-consistency

Browse Source 
Fix intl ICU inconsistencies
This commit is contained in:
Damian Mooyman 2017-05-09 15:52:22 +12:00 committed by GitHub
commit a136b8ad44
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/php/ORM/DBDatetimeTest.php
View File

@ -86,7 +86,8 @@ class DBDatetimeTest extends SapphireTest
public function testTime()
{
$date = DBDatetime::create_field('Datetime', '2001-12-31 22:10:59');
$this->assertEquals('10:10:59 PM', $date->Time());
// casing depends on system ICU library
$this->assertRegexp('#10:10:59 (PM|pm)#', $date->Time());
}
public function testTime24()

4
tests/php/ORM/DBMoneyTest.php
View File

@ -156,10 +156,6 @@ class DBMoneyTest extends SapphireTest
// USD in de locale
$USD->setLocale('de_DE');
$this->assertSame($this->clean('53.292,18 $'), $this->clean($USD->Nice()));
// USD in swedish locale is fun
$USD->setLocale('sv');
$this->assertSame($this->clean('53 292,18 US$'), $this->clean($USD->Nice()));
}
public function testGetSymbol()