Bugfix delivery for ACP2E-500, ACP2E-466

Author: nishant04412

app/code/Magento/Email/Model/Template.php

@@ -45,21 +45,21 @@ class Template extends AbstractTemplate implements \Magento\Framework\Mail\Templ
      * @deprecated
      * @see \Magento\Email\Model\Transport::XML_PATH_SENDING_SET_RETURN_PATH
      */
-    const XML_PATH_SENDING_SET_RETURN_PATH = 'system/smtp/set_return_path';
+    public const XML_PATH_SENDING_SET_RETURN_PATH = 'system/smtp/set_return_path';
 
     /**
      * Configuration path for custom Return-Path email
      * @deprecated
      * @see \Magento\Email\Model\Transport::XML_PATH_SENDING_RETURN_PATH_EMAIL
      */
-    const XML_PATH_SENDING_RETURN_PATH_EMAIL = 'system/smtp/return_path_email';
+    public const XML_PATH_SENDING_RETURN_PATH_EMAIL = 'system/smtp/return_path_email';
 
     /**
      * Config path to mail sending setting that shows if email communications are disabled
      * @deprecated
      * @see https://github.com/magento/magento2/issues/5988
      */
-    const XML_PATH_SYSTEM_SMTP_DISABLE = 'system/smtp/disable';
+    public const XML_PATH_SYSTEM_SMTP_DISABLE = 'system/smtp/disable';
 
     /**
      * BCC list
@@ -69,8 +69,6 @@ class Template extends AbstractTemplate implements \Magento\Framework\Mail\Templ
     protected $_bcc = [];
 
     /**
-     * Return path
-     *
      * @var string
      */
     protected $_returnPath = '';
@@ -253,7 +251,7 @@ public function getProcessedTemplateSubject(array $variables)
         );
 
         try {
-            $processedResult = $processor->setStoreId($storeId)->filter(__($this->getTemplateSubject())->render());
+            $processedResult = $processor->setStoreId($storeId)->filter($this->getTemplateSubject());
         } catch (\Exception $e) {
             $this->cancelDesignConfig();
             throw new \Magento\Framework\Exception\MailException(__($e->getMessage()), $e);

app/code/Magento/Email/Model/Template/Filter.php

@@ -23,6 +23,7 @@
 use Magento\Framework\Filter\Template\Tokenizer\Parameter;
 use Magento\Framework\Filter\VariableResolverInterface;
 use Magento\Framework\Stdlib\StringUtils;
+use Magento\Framework\Translate\Inline\StateInterface;
 use Magento\Framework\UrlInterface;
 use Magento\Framework\View\Asset\ContentProcessorException;
 use Magento\Framework\View\Asset\ContentProcessorInterface;
@@ -53,12 +54,12 @@ class Filter extends Template
     /**
      * The name used in the {{trans}} directive
      */
-    const TRANS_DIRECTIVE_NAME = 'trans';
+    public const TRANS_DIRECTIVE_NAME = 'trans';
 
     /**
      * The regex to match interior portion of a {{trans "foo"}} translation directive
      */
-    const TRANS_DIRECTIVE_REGEX = '/^\s*([\'"])([^\1]*?)(?<!\\\)\1(\s.*)?$/si';
+    public const TRANS_DIRECTIVE_REGEX = '/^\s*([\'"])([^\1]*?)(?<!\\\)\1(\s.*)?$/si';
 
     /**
      * @var bool
@@ -119,8 +120,6 @@ class Filter extends Template
 
     /**
      * Core store config
-     * Variable factory
-     *
      * @var VariableFactory
      */
     protected $_variableFactory;
@@ -190,6 +189,11 @@ class Filter extends Template
      */
     private $storeInformation;
 
+    /**
+     * @var StateInterface
+     */
+    private $inlineTranslationState;
+
     /**
      * Filter constructor.
      * @param StringUtils $string
@@ -211,6 +215,7 @@ class Filter extends Template
      * @param array $variables
      * @param array $directiveProcessors
      * @param StoreInformation|null $storeInformation
+     * @param StateInterface|null $inlineTranslationState
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -232,7 +237,8 @@ public function __construct(
         CssInliner $cssInliner,
         $variables = [],
         array $directiveProcessors = [],
-        ?StoreInformation $storeInformation = null
+        ?StoreInformation $storeInformation = null,
+        StateInterface $inlineTranslationState = null
     ) {
         $this->_escaper = $escaper;
         $this->_assetRepo = $assetRepo;
@@ -251,6 +257,8 @@ public function __construct(
         $this->configVariables = $configVariables;
         $this->storeInformation = $storeInformation ?:
             ObjectManager::getInstance()->get(StoreInformation::class);
+        $this->inlineTranslationState = $inlineTranslationState ?:
+            ObjectManager::getInstance()->get(StateInterface::class);
         parent::__construct($string, $variables, $directiveProcessors, $variableResolver);
     }
 
@@ -616,8 +624,9 @@ public function transDirective($construction)
         if (empty($text)) {
             return '';
         }
-
+        $this->inlineTranslationState->disable();
         $text = __($text, $params)->render();
+        $this->inlineTranslationState->enable();
         return $this->applyModifiers($text, $modifiers);
     }
 

dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php

@@ -158,6 +158,8 @@ public function layoutDirectiveDataProvider()
      * @param $expectedResult
      * @param array $variables
      * @internal param $translatorData
+     * @magentoConfigFixture default_store dev/translate_inline/active 1
+     * @magentoAppArea frontend
      * @dataProvider transDirectiveDataProvider
      */
     public function testTransDirective($directive, $translations, $expectedResult, $variables = [])

lib/web/magnifier/magnifier.js

@@ -541,25 +541,27 @@
 
             showWrapper = false;
             $(thumbObj).on('load', function () {
-                data[idx].status = 1;
-
-                $(largeObj).on('load', function () {
-
-                    if (largeObj.width > largeWrapper.width() || largeObj.height > largeWrapper.height()) {
-                        showWrapper = true;
-                        bindEvents(eventType, thumb);
-                        data[idx].status = 2;
-                        if (largeObj.width > largeObj.height) {
-                            data[idx].zoom = largeObj.width / largeWrapper.width();
-                        } else {
-                            data[idx].zoom = largeObj.height / largeWrapper.height();
+                if (data.length > 0) {
+                    data[idx].status = 1;
+
+                    $(largeObj).on('load', function () {
+
+                        if (largeObj.width > largeWrapper.width() || largeObj.height > largeWrapper.height()) {
+                            showWrapper = true;
+                            bindEvents(eventType, thumb);
+                            data[idx].status = 2;
+                            if (largeObj.width > largeObj.height) {
+                                data[idx].zoom = largeObj.width / largeWrapper.width();
+                            } else {
+                                data[idx].zoom = largeObj.height / largeWrapper.height();
+                            }
+                            setThumbData(thumb, data[idx]);
+                            updateLensOnLoad(idx, thumb, largeObj, largeWrapper);
                         }
-                        setThumbData(thumb, data[idx]);
-                        updateLensOnLoad(idx, thumb, largeObj, largeWrapper);
-                    }
-                });
+                    });
 
-                largeObj.src = data[idx].largeUrl;
+                    largeObj.src = data[idx].largeUrl;
+                }
             });
 
             thumbObj.src = thumb.src;