Permalink
Browse files

Allow 12 hour date to display for emails sent today (Doug Mandell).

  • Loading branch information...
thomascube committed Dec 20, 2006
1 parent 04c6180 commit 8c8b2a487ad8bade7c7ec4b4fb32b63237b6e0d3
Showing with 4 additions and 1 deletion.
  1. +3 −0 config/main.inc.php.dist
  2. +1 −1 program/include/main.inc
View
@@ -113,6 +113,9 @@ $rcmail_config['date_short'] = 'D H:i';
// use this format for detailed date/time formatting
$rcmail_config['date_long'] = 'd.m.Y H:i';
+// use this format for today's date display
+$rcmail_config['date_today'] = 'H:i';
+
// add this user-agent to message headers when sending
$rcmail_config['useragent'] = 'RoundCube Webmail/0.1b';
View
@@ -1710,7 +1710,7 @@ function format_date($date, $format=NULL)
// define date format depending on current time
if ($CONFIG['prettydate'] && !$format && $timestamp > $today_limit)
- return sprintf('%s %s', rcube_label('today'), date('H:i', $timestamp));
+ return sprintf('%s %s', rcube_label('today'), date($CONFIG['date_today'] ? $CONFIG['date_today'] : 'H:i', $timestamp));
else if ($CONFIG['prettydate'] && !$format && $timestamp > $week_limit)
$format = $CONFIG['date_short'] ? $CONFIG['date_short'] : 'D H:i';
else if (!$format)

0 comments on commit 8c8b2a4

Please sign in to comment.