From 990f87ffd02260b360b08fca4f28175f987924b5 Mon Sep 17 00:00:00 2001 From: thomasb Date: Mon, 12 Sep 2011 19:56:12 +0000 Subject: Make date/time format user configurable; drop 'date_today' config option git-svn-id: https://svn.roundcube.net/trunk@5210 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/steps/settings/func.inc | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'roundcubemail/program/steps/settings/func.inc') diff --git a/roundcubemail/program/steps/settings/func.inc b/roundcubemail/program/steps/settings/func.inc index 9e6b601a1..e6fd9109d 100644 --- a/roundcubemail/program/steps/settings/func.inc +++ b/roundcubemail/program/steps/settings/func.inc @@ -237,6 +237,33 @@ function rcmail_user_prefs($current=null) ); } + // date/time formatting + if (!isset($no_override['time_format'])) { + $reftime = mktime(7,30,0); + $field_id = 'rcmfd_time_format'; + $select_time = new html_select(array('name' => '_time_format', 'id' => $field_id)); + foreach ((array)$RCMAIL->config->get('time_formats', array('G:i', 'H:i', 'g:i a', 'h:i A')) as $choice) + $select_time->add(date($choice, $reftime), $choice); + + $blocks['main']['options']['time_format'] = array( + 'title' => html::label($field_id, Q(rcube_label('timeformat'))), + 'content' => $select_time->show($RCMAIL->config->get('time_format')), + ); + } + + if (!isset($no_override['date_format'])) { + $refdate = mktime(12,30,0,7,24); + $field_id = 'rcmfd_date_format'; + $select_date = new html_select(array('name' => '_date_format', 'id' => $field_id)); + foreach ((array)$RCMAIL->config->get('date_formats', array('Y-m-d','d-m-Y','Y/m/d','m/d/Y','d/m/Y','d.m.Y','j.n.Y')) as $choice) + $select_date->add(date($choice, $refdate), $choice); + + $blocks['main']['options']['date_format'] = array( + 'title' => html::label($field_id, Q(rcube_label('dateformat'))), + 'content' => $select_date->show($config['date_format']), + ); + } + // MM: Show checkbox for toggling 'pretty dates' if (!isset($no_override['prettydate'])) { $field_id = 'rcmfd_prettydate'; -- cgit v1.2.3