Skip to content
This repository has been archived by the owner on Dec 27, 2023. It is now read-only.

Commit

Permalink
fix(Felamimail/Rule): set app for translation if unset
Browse files Browse the repository at this point in the history
Change-Id: I58b562c4b4752ac906676041d947de0f550fce69
Reviewed-on: http://gerrit.tine20.com/customers/16893
Tested-by: Jenkins CI (http://ci.tine20.com/) <tine20-jenkins@metaways.de>
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
  • Loading branch information
Christian Feitl authored and pschuele committed Jun 17, 2020
1 parent 94fcdfe commit ae06fc8
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
3 changes: 3 additions & 0 deletions tine20/Felamimail/js/sieve/RuleConditionsPanel.js
Expand Up @@ -66,6 +66,9 @@ Tine.Felamimail.sieve.RuleConditionsPanel = Ext.extend(Tine.widgets.grid.FilterT
* @return {Array}
*/
Tine.Felamimail.sieve.RuleConditionsPanel.getFilterModel = function(app) {
if (! app) {
app = Tine.Tinebase.appMgr.get('Felamimail');
}
return [
{sort: 10, label: app.i18n._('From (Email)'), field: 'from', operators: ['contains', 'regex'], emptyText: 'test@example.org'},
{sort: 20, label: app.i18n._('From (Email and Name)'), field: 'fromheader', operators: ['contains', 'regex'], emptyText: 'name or email'},
Expand Down
3 changes: 3 additions & 0 deletions tine20/Felamimail/js/sieve/RuleEditDialog.js
Expand Up @@ -438,6 +438,9 @@ Tine.Felamimail.sieve.RuleEditDialog.openWindow = function (config) {
* @return {Array}
*/
Tine.Felamimail.sieve.RuleEditDialog.getActionTypes = function(app) {
if (! app) {
app = Tine.Tinebase.appMgr.get('Felamimail');
}
return [
['fileinto', app.i18n._('Move mail to folder')],
['redirect', app.i18n._('Redirect mail to address')],
Expand Down

0 comments on commit ae06fc8

Please sign in to comment.