diff -urN roundcubemail.orig/config/main.inc.php roundcubemail/config/main.inc.php
|
old
|
new
|
|
| 102 | 102 | // the default locale setting |
| 103 | 103 | $rcmail_config['locale_string'] = ''; |
| 104 | 104 | |
| | 105 | // use this format for emails that arrived today |
| | 106 | $rcmail_config['today_date'] = 'H:i'; |
| | 107 | |
| 105 | 108 | // use this format for short date display |
| 106 | 109 | $rcmail_config['date_short'] = 'D H:i'; |
| 107 | 110 | |
diff -urN roundcubemail.orig/program/include/main.inc roundcubemail/program/include/main.inc
|
old
|
new
|
|
| 1533 | 1533 | |
| 1534 | 1534 | // define date format depending on current time |
| 1535 | 1535 | if ($CONFIG['prettydate'] && !$format && $timestamp > $today_limit) |
| 1536 | | return sprintf('%s %s', rcube_label('today'), date('H:i', $timestamp)); |
| | 1536 | return sprintf('%s %s', rcube_label('today'), date($CONFIG['today_date'] ? $CONFIG['today_date'] : 'H:i', $timestamp)); |
| 1537 | 1537 | else if ($CONFIG['prettydate'] && !$format && $timestamp > $week_limit) |
| 1538 | 1538 | $format = $CONFIG['date_short'] ? $CONFIG['date_short'] : 'D H:i'; |
| 1539 | 1539 | else if (!$format) |