Permalink
Browse files

ENHANCEMENT Defaulting to 24h time format

  • Loading branch information...
1 parent feec8dd commit 00537a2c83d5e6818dc989298d74ba4a6428d7ba @chillu chillu committed Oct 14, 2011
Showing with 2 additions and 2 deletions.
  1. +2 −2 code/TZDateTimeField.php
View
@@ -104,7 +104,7 @@ function __construct($name, $title = null, $value = "") {
// For now, we override field, system or user defaults for anything other than en_NZ
// and its date/time formats
$this->dateField->setConfig('dateformat', 'dd/MM/YYYY');
- $this->dateField->setConfig('timeformat', 'hh:mma');
+ $this->dateField->setConfig('timeformat', 'HH:mm');
}
function Type() {
@@ -175,7 +175,7 @@ function convert() {
'rfc' => TZDateTimeField::convert($fromTz, $toTz, $datetime, 'r'),
'ymd12hr' => TZDateTimeField::convert($fromTz, $toTz, $datetime, 'Y-m-d h:i:s a'),
'ymd24hr' => TZDateTimeField::convert($fromTz, $toTz, $datetime, 'Y-m-d H:i:s'),
- 'popupdatetime' => TZDateTimeField::convert($fromTz, $toTz, $datetime, 'd/m/Y h:ia'),
+ 'popupdatetime' => TZDateTimeField::convert($fromTz, $toTz, $datetime, 'd/m/Y H:i'),
);
echo Convert::raw2json($return);

0 comments on commit 00537a2

Please sign in to comment.