holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

handle all text string for move and delete action success message

Browse Source
This commit is contained in:
Klaus Leithoff 2014-07-17 10:05:47 +00:00
parent 64b78af79f
commit d88acda181
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mail/inc/class.mail_ui.inc.php
View File

@ -4531,6 +4531,7 @@ $this->partID = $partID;
{
if(mail_bo::$debug) error_log(__METHOD__."->".print_r($_messageList,true).' Method:'.$_forceDeleteMethod);
$error = null;
$filtered = false;
if ($_messageList=='all' || !empty($_messageList['msg']))
{
if (isset($_messageList['all']) && $_messageList['all'])
@ -4549,6 +4550,7 @@ $this->partID = $partID;
emailadmin_imapbase::$supportsORinQuery = egw_cache::getCache(egw_cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60*60*10);
if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID])) emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]=true;
}
$filtered = true;
$filter = array('filterName' => (emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?lang('quicksearch'):lang('subject')),'type' => ($query['filter2']?$query['filter2']:(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?'quick':'subject')),'string' => $query['search'],'status' => (!empty($query['filter'])?$query['filter']:'any'));
}
else
@ -4603,7 +4605,7 @@ $this->partID = $partID;
$response = egw_json_response::get();
if (empty($error))
{
$response->call('app.mail.mail_deleteMessagesShowResult',array('egw_message'=>lang('deleted %1 messages in %2',($messageList=='all'||$_messageList['all']?lang('all'):count($_messageList['msg'])),$folder),'msg'=>$_messageList['msg']));
$response->call('app.mail.mail_deleteMessagesShowResult',array('egw_message'=>lang('deleted %1 messages in %2',($messageList=='all'||$_messageList['all']?($filtered?lang('all filtered'):lang('all')):count($_messageList['msg'])),$folder),'msg'=>$_messageList['msg']));
}
else
{
@ -4650,7 +4652,7 @@ $this->partID = $partID;
$lastFoldersUsedForMoveCont[$targetProfileID][$targetFolder]=$_folderName;
$changeFolderActions = true;
}
$filtered = false;
if ($_messageList=='all' || !empty($_messageList['msg']))
{
$error=false;
@ -4671,6 +4673,7 @@ $this->partID = $partID;
emailadmin_imapbase::$supportsORinQuery = egw_cache::getCache(egw_cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60*60*10);
if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID])) emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]=true;
}
$filtered = true;
$filter = array('filterName' => (emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?lang('quicksearch'):lang('subject')),'type' => ($query['filter2']?$query['filter2']:(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?'quick':'subject')),'string' => $query['search'],'status' => (!empty($query['filter'])?$query['filter']:'any'));
}
else
@ -4752,11 +4755,11 @@ $this->partID = $partID;
{
if ($_copyOrMove=='copy')
{
$response->call('egw.message',lang('copied %1 message(s) from %2 to %3',count($messageList),$folder,$targetFolder));
$response->call('egw.message',lang('copied %1 message(s) from %2 to %3',($messageList=='all'||$_messageList['all']?($filtered?lang('all filtered'):lang('all')):count($messageList)),$folder,$targetFolder));
}
else
{
$response->call('egw.refresh',lang('moved %1 message(s) from %2 to %3',count($messageList),$folder,$targetFolder),'mail',$messageListForRefresh,'delete');
$response->call('egw.refresh',lang('moved %1 message(s) from %2 to %3',($messageList=='all'||$_messageList['all']?($filtered?lang('all filtered'):lang('all')):count($messageList)),$folder,$targetFolder),'mail',$messageListForRefresh,'delete');
}
}
if ($changeFolderActions == true)

2
mail/lang/egw_de.lang
View File

@ -18,8 +18,10 @@ add all my aliases mail de Alle Alias Adressen hinzufügen
add folder mail de Neuer Ordner
add to addressbook mail de zum Adressbuch hinzufügen
aliases+forwards mail de Aliase+Weiterleitungen
all mail de alle
all adresses: mail de Alle Adressen
all available info admin de alle verfügbaren Informationen
all filtered mail de alle gefilterten
all messages in the folder will be lost mail de Alle Nachrichten in dem ausgewählten Ordner werden unwiderruflich gelöscht werden.
all of mail de alle
all subfolders will be deleted too, and all messages in all affected folders will be lost mail de Alle Unterordner und Nachrichten in den betroffenen Ordnern werden unwiederruflich gelöscht.

2
mail/lang/egw_en.lang
View File

@ -18,8 +18,10 @@ add all my aliases mail en Add all my aliases
add folder mail en Add Folder
add to addressbook mail en add to addressbook
aliases+forwards mail en Aliases+Forwards
all mail en all
all adresses: mail en All Adresses:
all available info admin en all available info
all filtered mail en all filtered
all messages in the folder will be lost mail en All messages in the folder will be lost
all of mail en all of
all subfolders will be deleted too, and all messages in all affected folders will be lost mail en All subfolders will be deleted too, and all messages in all affected folders will be lost