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

Add locale to Format

Browse Source 
Fix up some regressions
This commit is contained in:
Damian Mooyman 2018-06-14 17:28:16 +12:00
parent 02ae2e7ed0
commit 310a259c5f
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/ORM/FieldType/DBDate.php
View File

@ -38,7 +38,7 @@ class DBDate extends DBField
* Fixed locale to use for ISO date formatting. This is necessary to prevent
* locale-specific numeric localisation breaking internal date strings.
*/
const ISO_LOCALE = 'en_NZ';
const ISO_LOCALE = 'en_US';
public function setValue($value, $record = null, $markChanged = true)
{
@ -208,7 +208,7 @@ class DBDate extends DBField
*/
public function getFormatter($dateLength = IntlDateFormatter::MEDIUM, $timeLength = IntlDateFormatter::NONE)
{
return $this->getCustomFormatter(null, $dateLength, $timeLength);
return $this->getCustomFormatter(null, null, $dateLength, $timeLength);
}
/**
@ -262,9 +262,10 @@ class DBDate extends DBField
* for the day of the month ("1st", "2nd", "3rd" etc)
*
* @param string $format Format code string. See http://userguide.icu-project.org/formatparse/datetime
* @param string $locale Custom locale to use
* @return string The date in the requested format
*/
public function Format($format)
public function Format($format, $locale = null)
{
if (!$this->value) {
return null;
@ -275,9 +276,8 @@ class DBDate extends DBField
$format = str_replace('{o}', "'{$this->DayOfMonth(true)}'", $format);
}
$formatter = $this->getFormatter();
$formatter->setPattern($format);
return $formatter->format($this->getTimestamp());
$formatter = $this->getCustomFormatter($locale, $format);
return $formatter->Format($this->getTimestamp());
}
/**
@ -311,9 +311,7 @@ class DBDate extends DBField
}
// Get user format
$format = $member->getDateFormat();
$formatter = $this->getCustomFormatter($format, $member->getLocale());
return $formatter->format($this->getTimestamp());
return $this->Format($member->getDateFormat(), $member->getLocale());
}
/**
@ -549,7 +547,7 @@ class DBDate extends DBField
*/
public function URLDate()
{
return rawurlencode($this->Format(self::ISO_DATE));
return rawurlencode($this->Format(self::ISO_DATE, self::ISO_LOCALE));
}
public function scaffoldFormField($title = null, $params = null)

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

@ -111,7 +111,7 @@ class DBDatetime extends DBDate implements TemplateGlobalProvider
$timeFormat = $member->getTimeFormat();
// Get user format
return $this->Format($dateFormat . ' ' . $timeFormat);
return $this->Format($dateFormat . ' ' . $timeFormat, $member->getLocale());
}
public function requireField()
@ -135,16 +135,17 @@ class DBDatetime extends DBDate implements TemplateGlobalProvider
*/
public function URLDatetime()
{
return rawurlencode($this->Format(self::ISO_DATETIME));
return rawurlencode($this->Format(self::ISO_DATETIME, self::ISO_LOCALE));
}
public function scaffoldFormField($title = null, $params = null)
{
$field = DatetimeField::create($this->name, $title);
$dateTimeFormat = $field->getDatetimeFormat();
$locale = $field->getLocale();
// Set date formatting hints and example
$date = static::now()->Format($dateTimeFormat);
$date = static::now()->Format($dateTimeFormat, $locale);
$field
->setDescription(_t(
'SilverStripe\\Forms\\FormField.EXAMPLE',
@ -225,7 +226,7 @@ class DBDatetime extends DBDate implements TemplateGlobalProvider
*/
public function getFormatter($dateLength = IntlDateFormatter::MEDIUM, $timeLength = IntlDateFormatter::MEDIUM)
{
return new IntlDateFormatter(i18n::get_locale(), $dateLength, $timeLength);
return parent::getFormatter($dateLength, $timeLength);
}