Ticket #1483879: today_date.diff

File today_date.diff, 1.2 KB (added by darkcoder, 4 years ago)
  • config/main.inc.php

    diff -urN roundcubemail.orig/config/main.inc.php roundcubemail/config/main.inc.php
    old new  
    102102// the default locale setting 
    103103$rcmail_config['locale_string'] = ''; 
    104104 
     105// use this format for emails that arrived today 
     106$rcmail_config['today_date'] = 'H:i'; 
     107 
    105108// use this format for short date display 
    106109$rcmail_config['date_short'] = 'D H:i'; 
    107110 
  • program/include/main.inc

    diff -urN roundcubemail.orig/program/include/main.inc roundcubemail/program/include/main.inc
    old new  
    15331533 
    15341534  // define date format depending on current time   
    15351535  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)); 
    15371537  else if ($CONFIG['prettydate'] && !$format && $timestamp > $week_limit) 
    15381538    $format = $CONFIG['date_short'] ? $CONFIG['date_short'] : 'D H:i'; 
    15391539  else if (!$format)