extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-26 15:59:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix calendar preferences to show start- and end-time of day

Browse Source
This commit is contained in:
Ralf Becker 2016-05-03 13:24:21 +00:00
parent c3482510b6
commit e5d6f6a909
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/src/Etemplate/Widget/Select.php
View File

@ -716,11 +716,12 @@ class Select extends Etemplate\Widget
break; break;
case 'select-hour': case 'select-hour':
$minutes = !$type2 ? ':00' : '';
for ($h = 0; $h <= 23; ++$h) for ($h = 0; $h <= 23; ++$h)
{ {
$options[$h] = $GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == 12 ? $options[$h] = $GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == 12 ?
(($h % 12 ? $h % 12 : 12).' '.($h < 12 ? lang('am') : lang('pm'))) : (($h % 12 ? $h % 12 : 12).$minutes.' '.($h < 12 ? lang('am') : lang('pm'))) :
sprintf('%02d',$h); sprintf('%02d',$h).$minutes;
} }
$no_lang = True; $no_lang = True;
break; break;

2
calendar/inc/class.calendar_hooks.inc.php
View File

@ -157,7 +157,7 @@ class calendar_hooks
if (!isset($hook_data['setup'])) if (!isset($hook_data['setup']))
{ {
$times = Api\Etemplate\Widget\Select::typeOptions('select-time', ''); $times = Api\Etemplate\Widget\Select::typeOptions('select-hour', '');
} }
for ($i = 2; $i <= 4; ++$i) for ($i = 2; $i <= 4; ++$i)
{ {