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

add missing translations for emptying spam/junk folder; fix setting folder status after voiding spam/junk folder content

Browse Source
This commit is contained in:
Klaus Leithoff 2015-02-19 13:41:40 +00:00
parent c67ab8744a
commit 3ef17e277f
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -630,7 +630,7 @@ class mail_ui
if ($junkFolder && !empty($junkFolder))
{
$tree_actions['empty_spam'] = array(
'caption' => 'empty spam',
'caption' => 'empty junk',
'icon' => 'dhtmlxtree/MailFolderJunk',
'enabled' => 'javaScript:app.mail.spamfolder_enabled',
'onExecute' => 'javaScript:app.mail.mail_emptySpam',
@ -4248,7 +4248,7 @@ class mail_ui
if(!empty($junkFolder)) {
if ($selectedFolder == $icServerID.self::$delimiter.$junkFolder)
{
// Lock the tree if the active folder is Trash folder
// Lock the tree if the active folder is junk folder
$response->call('app.mail.lock_tree');
}
$this->mail_bo->deleteMessages('all',$junkFolder,'remove_immediately');
@ -4256,10 +4256,10 @@ class mail_ui
$heirarchyDelimeter = $this->mail_bo->getHierarchyDelimiter(true);
$fShortName = array_pop(explode($heirarchyDelimeter, $junkFolder));
$fStatus = array(
$icServerID.self::$delimiter.$trashFolder => lang($fShortName)
$icServerID.self::$delimiter.$junkFolder => lang($fShortName)
);
//Call to reset folder status counter, after junkFolder triggered not from Junk folder
//-as we don't have trash folder specific information available on client-side we need to deal with it on server
//-as we don't have junk folder specific information available on client-side we need to deal with it on server
$response->call('app.mail.mail_setFolderStatus',$fStatus);
}
if ($rememberServerID != $this->mail_bo->profileID)

2
mail/js/app.js
View File

@ -1604,7 +1604,7 @@ app.classes.mail = AppJS.extend(
var activeFilters = this.mail_getActiveFilters();
var self = this;
this.egw.message(this.egw.lang('empty spam'));
this.egw.message(this.egw.lang('empty junk'));
egw.json('mail.mail_ui.ajax_emptySpam',[server[0], activeFilters['selectedFolder']? activeFilters['selectedFolder']:null],function(){self.unlock_tree();})
.sendRequest(true);

1
mail/lang/egw_de.lang
View File

@ -135,6 +135,7 @@ email notification update failed mail de Die Benachrichtigung über den Gelesen-
email notification update failed! you need to set an email address! mail de Aktualisierung der E-Mail Benachrichtigungen fehlgeschlagen! Es muss eine E-Mail-Adresse ausgewählt sein!
emailaddress admin de E-Mail
emailadmin: profilemanagement mail de E-Mail-Admin: Profilmanagement
empty junk mail de Junk-/Spam- Ordner leeren
empty trash mail de Papierkorb leeren
enable mail de Aktivieren
enabled! mail de aktiviert!

1
mail/lang/egw_en.lang
View File

@ -135,6 +135,7 @@ email notification update failed mail en email notification update failed
email notification update failed! you need to set an email address! mail en email notification update failed! You need to set an email address!
emailaddress admin en emailaddress
emailadmin: profilemanagement mail en eMailAdmin: Profilemanagement
empty junk mail en empty junk/spam folder
empty trash mail en empty trash
enable mail en Enable
enabled! mail en enabled!