From 8c8b2a487ad8bade7c7ec4b4fb32b63237b6e0d3 Mon Sep 17 00:00:00 2001
From: svncommit <devs@roundcube.net>
Date: Wed, 20 Dec 2006 10:59:50 -0500
Subject: [PATCH] Allow 12 hour date to display for emails sent today (Doug Mandell).
---
program/include/main.inc | 2 +-
config/main.inc.php.dist | 3 +++
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index fb227c4..490c623 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -113,6 +113,9 @@
// 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';
diff --git a/program/include/main.inc b/program/include/main.inc
index c6370ea..c57aa8a 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -1710,7 +1710,7 @@
// 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)
--
Gitblit v1.9.1