extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-27 10:23:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

* eMail: added translations for SIEVE notifications

Browse Source
This commit is contained in:
Klaus Leithoff 2012-08-13 10:03:39 +00:00
parent 1d36c1710f
commit 3b763e3c6a
5 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
felamimail/inc/class.felamimail_bo.inc.php
View File

@ -4604,6 +4604,8 @@ class felamimail_bo
$newBody = $matches[2];
}
$htmLawed = new egw_htmLawed();
// the next line should not be needed
$newBody = str_replace(array('&amp;amp;','<DIV><BR></DIV>',"<DIV>&nbsp;</DIV>",'<div>&nbsp;</div>'),array('&amp;','<BR>','<BR>','<BR>'),$newBody);
$newBody = $htmLawed->egw_htmLawed($newBody);
if ($hasOther && $preserveHTML) $newBody = $matches[1]. $newBody. $matches[3];
}

2
felamimail/inc/class.uisieve.inc.php
View File

@ -1088,7 +1088,7 @@
$this->t->set_var("lang_discard_message",lang('discard message'));
$this->t->set_var("lang_select_folder",lang('select folder'));
$this->t->set_var("lang_vacation_forwards",lang('Forward messages to').'<br />'.lang('(separate multiple addresses by comma)').":");
$this->t->set_var("lang_email_notification_settings",lang('email notification settings'));
$this->t->set_var("bg01",$GLOBALS['egw_info']["theme"]["bg01"]);
$this->t->set_var("bg02",$GLOBALS['egw_info']["theme"]["bg02"]);
$this->t->set_var("bg03",$GLOBALS['egw_info']["theme"]["bg03"]);

2
felamimail/lang/egw_de.lang
View File

@ -169,6 +169,8 @@ edit vacation settings felamimail de Abwesenheitsnotiz bearbeiten
editor type felamimail de Editortyp
email address felamimail de E-Mail-Adresse
email forwarding address felamimail de Zieladresse
email notification felamimail de eMail Benachrichtigung
email notification settings felamimail de Einstellungen: eMail Benachrichtigung
email notification update failed felamimail de Die Benachrichtigung über den Gelesen-Status der E-Mail ist fehlgeschlagen.
email signature felamimail de E-Mail-Signatur
emailaddress felamimail de E-Mail-Adresse

2
felamimail/lang/egw_en.lang
View File

@ -169,6 +169,8 @@ edit vacation settings felamimail en Edit vacation settings
editor type felamimail en Editor type
email address felamimail en Email address
email forwarding address felamimail en Email forwarding address
email notification felamimail en email notification
email notification settings felamimail en email notification settings
email notification update failed felamimail en Email notification update failed
email signature felamimail en Email signature
emailaddress felamimail en Email address

2
felamimail/templates/default/sieveForm.tpl
View File

@ -331,7 +331,7 @@ function submitIt()
<form ACTION="{email_notification_action_url}" METHOD="post" NAME="editVacation">
<table WIDTH="100%" CELLPADDING="2" CELLSPACING="1" style="border: 1px solid silver;">
<tr CLASS="th">
<td colspan="2">email notification settings</td>
<td colspan="2">{lang_email_notification_settings}</td>
</tr>
<tr CLASS="row_on">
<td>Status:</td>