0011930: conjunction operator not shown correctly in rule edit dialog

* set operator on record load
* adds translation for 'or' operator

https://forge.tine20.org/view.php?id=11930

Change-Id: I7a0f0fdcb7e3315792460e4883bb5eadce01dd31
Reviewed-on: http://gerrit.tine20.com/customers/3226
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>

diff --git a/tine20/Felamimail/js/sieve/RuleEditDialog.js b/tine20/Felamimail/js/sieve/RuleEditDialog.js
index 0f5e88d..4c8bd91 100644 (file)
--- a/tine20/Felamimail/js/sieve/RuleEditDialog.js
+++ b/tine20/Felamimail/js/sieve/RuleEditDialog.js
@@ -98,6 +98,8 @@ Tine.Felamimail.sieve.RuleEditDialog = Ext.extend(Tine.widgets.dialog.EditDialog
         this.window.setTitle(title);
         
         this.getForm().loadRecord(this.record);
+
+        this.conditionsPanel.conjunctionOperator = this.record.get('conjunction') == 'anyof' ? 'or' : 'and';
         
         this.loadMask.hide();
     },
@@ -227,7 +229,7 @@ Tine.Felamimail.sieve.RuleEditDialog = Ext.extend(Tine.widgets.dialog.EditDialog
     /**
      * returns dialog
      * 
-     * NOTE: when this method gets called, all initalisation is done.
+     * NOTE: when this method gets called, all initialization is done.
      * 
      * @return {Object}
      * @private

diff --git a/tine20/Tinebase/js/widgets/grid/FilterToolbar.js b/tine20/Tinebase/js/widgets/grid/FilterToolbar.js
index 50535bb..aaa9540 100644 (file)
--- a/tine20/Tinebase/js/widgets/grid/FilterToolbar.js
+++ b/tine20/Tinebase/js/widgets/grid/FilterToolbar.js
@@ -110,8 +110,10 @@ Ext.extend(Tine.widgets.grid.FilterToolbar, Ext.Panel, {
      * 
      * @type String
      */
-    conjunctionOperator: 'and', // _('and')
-    
+    conjunctionOperator: 'and',
+    // _('and')
+    // _('or')
+
     header: false,
     border: false,
     monitorResize: true,

diff --git a/tine20/Tinebase/translations/de.po b/tine20/Tinebase/translations/de.po
index 406303b..b1d875d 100644 (file)
--- a/tine20/Tinebase/translations/de.po
+++ b/tine20/Tinebase/translations/de.po
@@ -1440,6 +1440,10 @@ msgstr "Zeige"
 msgid "and"
 msgstr "und"
 
+#: js/widgets/grid/FilterToolbar.js:113
+msgid "or"
+msgstr "oder"
+
 #: js/widgets/grid/FilterToolbar.js:178
 msgid "add new filter"
 msgstr "neuen Filter hinzufügen"