viscous/espocrm
1
0
Fork 0
mirror of https://github.com/espocrm/espocrm.git synced 2026-06-27 22:46:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

add 2 time formats

Browse Source
This commit is contained in:
Yuri Kuznetsov
2014-03-27 17:14:24 +02:00
parent b4a5376b91
commit a19cb3608c
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
application/Espo/Core/Utils/DateTime.php
View File

@@ -39,7 +39,8 @@ class DateTime
protected $timeFormats = array(
'HH:mm' => 'H:i',
'hh:mm A' => 'h:i A',
'hh:mm a' => 'h:i a',
'hh:mm a' => 'h:ia',
'hh:mmA' => 'h:iA',
);
public function __construct($dateFormat = 'YYYY-MM-DD', $timeFormat = 'HH:mm', $timeZone = 'UTC')

2
application/Espo/Resources/metadata/entityDefs/Preferences.json
View File

@@ -11,7 +11,7 @@
},
"timeFormat": {
"type": "enum",
"options": ["HH:mm", "hh:mm A", "hh:mm a"],
"options": ["HH:mm", "hh:mma", "hh:mmA", "hh:mm A", "hh:mm a"],
"default": "HH:mm"
},
"weekStart": {

2
application/Espo/Resources/metadata/entityDefs/Settings.json
View File

@@ -30,7 +30,7 @@
},
"timeFormat": {
"type": "enum",
"options": ["HH:mm", "hh:mm A", "hh:mm a"],
"options": ["HH:mm", "hh:mma", "hh:mmA", "hh:mm A", "hh:mm a"],
"default": "HH:mm"
},
"weekStart": {