Changeset 2616 in subversion


Ignore:
Timestamp:
Jun 5, 2009 12:24:10 PM (4 years ago)
Author:
alec
Message:
  • add 'Deleted' to search filter
Location:
trunk/roundcubemail
Files:
8 edited

Legend:

Unmodified
Added
Removed

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

    r2537 r2616  
    414414$rcmail_config['read_when_deleted'] = TRUE; 
    415415 
    416 // When a Trash folder is not present and a message is deleted, flag  
    417 // the message for deletion rather than deleting it immediately.  Setting this to  
    418 // false causes deleted messages to be permanantly removed if there is no Trash folder 
     416// Set to TRUE to newer delete messages immediately 
     417// Use 'Purge' to remove messages marked as deleted  
    419418$rcmail_config['flag_for_deletion'] = FALSE; 
    420419 

  • trunk/roundcubemail/program/localization/en_GB/labels.inc

    r2581 r2616  
    123123$labels['flagged'] = 'Flagged'; 
    124124$labels['unanswered'] = 'Unanswered'; 
     125$labels['deleted'] = 'Deleted'; 
    125126$labels['invert'] = 'Invert'; 
    126127$labels['filter'] = 'Filter'; 

  • trunk/roundcubemail/program/localization/en_GB/messages.inc

    r2493 r2616  
    4747$messages['errormoving'] = 'Could not move the message'; 
    4848$messages['errordeleting'] = 'Could not delete the message'; 
     49$messages['errormarking'] = 'Could not mark the message'; 
    4950$messages['deletecontactconfirm'] = 'Do you really want to delete the selected contact(s)?'; 
    5051$messages['deletemessagesconfirm'] = 'Do you really want to delete the selected message(s)?'; 

  • trunk/roundcubemail/program/localization/en_US/labels.inc

    r2581 r2616  
    151151$labels['flagged'] = 'Flagged'; 
    152152$labels['unanswered'] = 'Unanswered'; 
     153$labels['deleted'] = 'Deleted'; 
    153154$labels['invert'] = 'Invert'; 
    154155$labels['filter'] = 'Filter'; 

  • trunk/roundcubemail/program/localization/en_US/messages.inc

    r2493 r2616  
    4747$messages['errormoving'] = 'Could not move the message'; 
    4848$messages['errordeleting'] = 'Could not delete the message'; 
     49$messages['errormarking'] = 'Could not mark the message'; 
    4950$messages['deletecontactconfirm']  = 'Do you really want to delete the selected contact(s)?'; 
    5051$messages['deletemessagesconfirm'] = 'Do you really want to delete the selected message(s)?'; 

  • trunk/roundcubemail/program/localization/pl_PL/labels.inc

    r2581 r2616  
    145145$labels['flagged'] = 'Oznaczone'; 
    146146$labels['unanswered'] = 'Bez odpowiedzi'; 
     147$labels['deleted'] = 'Usunięte'; 
    147148$labels['invert'] = 'Odwróć'; 
    148149$labels['filter'] = 'Filtr'; 

  • trunk/roundcubemail/program/localization/pl_PL/messages.inc

    r2512 r2616  
    6565$messages['errordeleting'] = 'Nie moÅŒna usunÄ 
    6666ć wiadomości!'; 
     67$messages['errormarking'] = 'Nie moÅŒna oznaczyć wiadomości!'; 
    6768$messages['deletecontactconfirm'] = 'Czy na pewno chcesz usunÄ 
    6869ć wybrane kontakty?'; 

  • trunk/roundcubemail/program/steps/mail/func.inc

    r2615 r2616  
    14471447function rcmail_search_filter($attrib) 
    14481448{ 
    1449   global $OUTPUT; 
     1449  global $OUTPUT, $CONFIG; 
    14501450 
    14511451  if (!strlen($attrib['id'])) 
    … …  
    14671467  $select_filter->add(rcube_label('flagged'), 'FLAGGED'); 
    14681468  $select_filter->add(rcube_label('unanswered'), 'UNANSWERED'); 
     1469  if (!$CONFIG['skip_deleted']) 
     1470    $select_filter->add(rcube_label('deleted'), 'DELETED'); 
    14691471 
    14701472  $out = $select_filter->show($_SESSION['search_filter']); 
Note: See TracChangeset for help on using the changeset viewer.