Changeset 423 in subversion

Timestamp:

Dec 20, 2006 10:59:50 AM (6 years ago)

Author:

robin

Message:

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

Location:

trunk/roundcubemail

Files:

• config/main.inc.php.dist (modified) (1 diff)
• program/include/main.inc (modified) (1 diff)

trunk/roundcubemail/config/main.inc.php.dist

@@ -113 +113 @@
 // 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

trunk/roundcubemail/program/include/main.inc

@@ -1711 +1711 @@
   // 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';