Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

ENHANCEMENT Defaulting to 24h time format

  • Loading branch information...
commit 00537a2c83d5e6818dc989298d74ba4a6428d7ba 1 parent feec8dd
Ingo Schommer authored

Showing 1 changed file with 2 additions and 2 deletions. Show diff stats Hide diff stats

  1. 4  code/TZDateTimeField.php
4  code/TZDateTimeField.php
@@ -104,7 +104,7 @@ function __construct($name, $title = null, $value = "") {
104 104
 		// For now, we override field, system or user defaults for anything other than en_NZ
105 105
 		// and its date/time formats
106 106
 		$this->dateField->setConfig('dateformat', 'dd/MM/YYYY');
107  
-		$this->dateField->setConfig('timeformat', 'hh:mma');
  107
+		$this->dateField->setConfig('timeformat', 'HH:mm');
108 108
 	}
109 109
 	
110 110
 	function Type() {
@@ -175,7 +175,7 @@ function convert() {
175 175
 			'rfc' => TZDateTimeField::convert($fromTz, $toTz, $datetime, 'r'),
176 176
 			'ymd12hr' => TZDateTimeField::convert($fromTz, $toTz, $datetime, 'Y-m-d h:i:s a'),
177 177
 			'ymd24hr' => TZDateTimeField::convert($fromTz, $toTz, $datetime, 'Y-m-d H:i:s'),
178  
-			'popupdatetime' => TZDateTimeField::convert($fromTz, $toTz, $datetime, 'd/m/Y h:ia'),
  178
+			'popupdatetime' => TZDateTimeField::convert($fromTz, $toTz, $datetime, 'd/m/Y H:i'),
179 179
 		);
180 180
 		
181 181
 		echo Convert::raw2json($return);

0 notes on commit 00537a2

Please sign in to comment.
Something went wrong with that request. Please try again.