From bd26e2aeaf28dc97cde489624345920996cd87ba Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Tue, 26 Apr 2016 10:13:59 +0000 Subject: [PATCH] reenable filter2 (short-preview in list trigger) --- mail/inc/class.mail_ui.inc.php | 6 +++--- mail/lang/egw_de.lang | 2 ++ mail/lang/egw_en.lang | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php index be83888ba0..509f3b6ff9 100644 --- a/mail/inc/class.mail_ui.inc.php +++ b/mail/inc/class.mail_ui.inc.php @@ -442,7 +442,7 @@ class mail_ui // These must always be set, even if $content is an array $content[self::$nm_index]['cat_is_select'] = true; // Category select is just a normal selectbox - $content[self::$nm_index]['no_filter2'] = true; // Disable second filter + $content[self::$nm_index]['no_filter2'] = false; // Disable second filter $content[self::$nm_index]['actions'] = self::get_actions(); $content[self::$nm_index]['row_id'] = 'row_id'; // is a concatenation of trim($GLOBALS['egw_info']['user']['account_id']):profileID:base64_encode(FOLDERNAME):uid $content[self::$nm_index]['placeholder_actions'] = array('composeasnew'); @@ -533,7 +533,7 @@ class mail_ui //error_log(__METHOD__.__LINE__.array2string($GLOBALS['egw_info']['user']['preferences']['mail']['ActiveSearchType'])); $content[self::$nm_index]['cat_id'] = $GLOBALS['egw_info']['user']['preferences']['mail']['ActiveSearchType']; $sel_options['filter'] = $this->statusTypes; - $sel_options['filter2'] = array(''=>'No details',1=>'Details'); + $sel_options['filter2'] = array(''=>lang('No details'),1=>lang('Details')); $content[self::$nm_index]['filter2'] = $GLOBALS['egw_info']['user']['preferences']['mail']['ShowDetails']; $etpl = new etemplate_new('mail.index'); @@ -4203,7 +4203,7 @@ $filter['before']= date("d-M-Y", $cutoffdate2); $response = egw_json_response::get(); $response->call('app.mail.mail_refreshCatIdOptions',$this->searchTypes); $response->call('app.mail.mail_refreshFilterOptions',$this->statusTypes); - $response->call('app.mail.mail_refreshFilter2Options',array(''=>'No details',1=>'Details')); + $response->call('app.mail.mail_refreshFilter2Options',array(''=>lang('No details'),1=>lang('Details'))); } diff --git a/mail/lang/egw_de.lang b/mail/lang/egw_de.lang index 52df20fbfd..be6d39f3ad 100644 --- a/mail/lang/egw_de.lang +++ b/mail/lang/egw_de.lang @@ -92,6 +92,7 @@ date(oldest first) mail de Datum (alte zuerst) deactive mail de Deaktiviert default sorting order mail de Wählen Sie die Standard-Sortierreihenfolge aus. default your name and email common de z.B. Ihr Name und Ihre Mail-Adresse +details mail de Kurzvorschau in der Liste delete folder mail de Ordner Löschen delete folder %1 ? mail de Ordner %1 löschen? deleted mail de gelöscht @@ -303,6 +304,7 @@ no access mail de Kein Zugriff no action defined! mail de Keine Aktion ausgewählt! no address to/cc/bcc supplied, and no folder to save message to provided. mail de Keine Empfänger-Adresse (An/Kopie/Blindkopie) angegeben und kein Ordner zur Ablage der E-Mail spezifiziert. no adress, to send this mail to, supplied mail de Keine Empfängeradresse angegeben! +no details mail de Keine Kurzvorschau in der Liste no folder destination supplied, and no folder to save message or other measure to store the mail (save to infolog/tracker) provided, but required. mail de Es sind keine Zielordner oder andere Methoden (als Infolog/Tracker ablegen) angegeben, um die Nachricht nach dem Senden zu speichern. no folders mail de Keine Ordner no message body supplied mail de Keinen Nachrichtentext - Teil gefunden. diff --git a/mail/lang/egw_en.lang b/mail/lang/egw_en.lang index 653b092eb4..3db8021ce2 100644 --- a/mail/lang/egw_en.lang +++ b/mail/lang/egw_en.lang @@ -92,6 +92,7 @@ date(oldest first) mail en date(oldest first) deactive mail en Deactive default sorting order mail en Default sorting order default your name and email common en default your name and email +details mail en short preview in list delete folder mail en Delete Folder delete folder %1 ? mail en DELETE Folder %1 ? deleted mail en deleted @@ -303,6 +304,7 @@ no access mail en no access no action defined! mail en No action defined! no address to/cc/bcc supplied, and no folder to save message to provided. mail en No Address TO/CC/BCC supplied, and no folder to save message to provided. no adress, to send this mail to, supplied mail en no adress, to send this mail to, supplied +no details mail en no short preview in list no folder destination supplied, and no folder to save message or other measure to store the mail (save to infolog/tracker) provided, but required. mail en No Folder destination supplied, and no folder to save message or other measure to store the mail (save to infolog/tracker) provided, but required. no folders mail en no folders no message body supplied mail en no message body supplied