Merge branch '2024.11'

tine-groupware · Nov 27, 2024 · ba83cb1 · ba83cb1
2 parents de28b78 + a388416
commit ba83cb1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/tests/tine20/OnlyOfficeIntegrator/JsonTests.php b/tests/tine20/OnlyOfficeIntegrator/JsonTests.php
@@ -926,36 +926,35 @@ public function testGetTokenForNodeIdException3()
         $this->_uit->getEmbedUrlForNodeId($node->getId());
     }
 
+    protected function _checkSystemGenericException($node)
+    {
+        $translation = Tinebase_Translation::getTranslation('OnlyOfficeIntegrator');
+        static::expectException(Tinebase_Exception_SystemGeneric::class);
+        static::expectExceptionMessage($translation->_('filetype of node is not supported'));
+        $this->_uit->getEmbedUrlForNodeId($node->getId());
+    }
+
     public function testGetTokenForNodeIdException4()
     {
         Tinebase_FileSystem::getInstance()->createAclNode('/Tinebase/folders/shared/ootest');
         file_put_contents('tine20:///Tinebase/folders/shared/ootest/test.asd', 'blub');
         $node = Tinebase_FileSystem::getInstance()->stat('/Tinebase/folders/shared/ootest/test.asd');
-
-        static::expectException(Tinebase_Exception_SystemGeneric::class);
-        static::expectExceptionMessage('filetype of node is not supported');
-        $this->_uit->getEmbedUrlForNodeId($node->getId());
+        $this->_checkSystemGenericException($node);
     }
 
     public function testGetTokenForNodeIdException5()
     {
         Tinebase_FileSystem::getInstance()->createAclNode('/Tinebase/folders/shared/ootest');
         $node = Tinebase_FileSystem::getInstance()->stat('/Tinebase/folders/shared/ootest');
-
-        static::expectException(Tinebase_Exception_SystemGeneric::class);
-        static::expectExceptionMessage('filetype of node is not supported');
-        $this->_uit->getEmbedUrlForNodeId($node->getId());
+        $this->_checkSystemGenericException($node);
     }
 
     public function testGetTokenForNodeIdException6()
     {
         Tinebase_FileSystem::getInstance()->createAclNode('/Tinebase/folders/shared/ootest');
         file_put_contents('tine20:///Tinebase/folders/shared/ootest/test.asd', 'blub');
         $node = Tinebase_FileSystem::getInstance()->stat('/Tinebase/folders/shared/ootest/test.asd');
-
-        static::expectException(Tinebase_Exception_SystemGeneric::class);
-        static::expectExceptionMessage('filetype of node is not supported');
-        $this->_uit->getEditorConfigForNodeId($node->getId());
+        $this->_checkSystemGenericException($node);
     }
 
     public function testGetTokenForNodeIdException7()
@@ -973,9 +972,10 @@ public function testGetTokenForNodeIdException7()
         $httpTestClient = new Zend_Http_Client_Adapter_Test();
         $httpTestClient->setResponse(new Zend_Http_Response(200, [], '{"error":0}'));
         onlyOfficeIntegrator_Controller::getInstance()->setCmdServiceClientAdapter($httpTestClient);
-
+
+        $translation = Tinebase_Translation::getTranslation('OnlyOfficeIntegrator');
         static::expectException(Tinebase_Exception_SystemGeneric::class);
-        static::expectExceptionMessage('this revision currently can\'t be opened as a different revision is already open');
+        static::expectExceptionMessage($translation->_('this revision currently can\'t be opened as a different revision is already open'));
         static::expectExceptionCode(647);
         $this->_uit->getEditorConfigForNodeId($node->getId());
     }

diff --git a/tine20/GDPR/js/Felamimail/MessageEditDialogPlugin.js b/tine20/GDPR/js/Felamimail/MessageEditDialogPlugin.js
@@ -184,7 +184,7 @@ Tine.GDPR.Felamimail.MessageEditDialogPlugin.prototype = {
             getEventData: function (eventName) {
                 const option = this.getForm().findField('optionGroup').getValue();
                 if (eventName === 'apply') return {
-                    recipientMode: option ? option.getGroupValue() : '',
+                    recipientMode: option || '',
                 }
             },
             items: [{