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 #8446 from sminnee/fix-8121

Browse Source 
FIX: Drop seconds from DBDatetime::Nice() to restore SS3 behaviour.
This commit is contained in:
Robbie Averill 2018-10-04 08:38:42 +00:00 committed by GitHub
commit 4c25894a59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ORM/FieldType/DBDatetime.php
View File

@ -223,7 +223,7 @@ class DBDatetime extends DBDate implements TemplateGlobalProvider
* @param int $timeLength * @param int $timeLength
* @return IntlDateFormatter * @return IntlDateFormatter
*/ */
public function getFormatter($dateLength = IntlDateFormatter::MEDIUM, $timeLength = IntlDateFormatter::MEDIUM) public function getFormatter($dateLength = IntlDateFormatter::MEDIUM, $timeLength = IntlDateFormatter::SHORT)
{ {
return parent::getFormatter($dateLength, $timeLength); return parent::getFormatter($dateLength, $timeLength);
} }

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

@ -88,9 +88,14 @@ class DBDatetimeTest extends SapphireTest
public function testNice() public function testNice()
{ {
$date = DBDatetime::create_field('Datetime', '2001-12-31 22:10:59'); $date = DBDatetime::create_field('Datetime', '2001-12-11 22:10:59');
// note: Some localisation packages exclude the ',' in default medium format // note: Some localisation packages exclude the ',' in default medium format
$this->assertRegExp('#31/12/2001(,)? 10:10:59 PM#i', $date->Nice()); i18n::set_locale('en_NZ');
$this->assertRegExp('#11/12/2001(,)? 10:10 PM#i', $date->Nice());
i18n::set_locale('en_US');
$this->assertRegExp('#Dec 11(,)? 2001(,)? 10:10 PM#i', $date->Nice());
} }
public function testDate() public function testDate()