Merge remote-tracking branch 'l3/ACP2E-537' into PR_L3_22_04_2022

Author: veloraven

app/code/Magento/Backend/Controller/Adminhtml/Ajax/Translate.php

@@ -6,9 +6,10 @@
  */
 namespace Magento\Backend\Controller\Adminhtml\Ajax;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Backend\App\Action;
 
-class Translate extends \Magento\Backend\App\Action
+class Translate extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Framework\Translate\Inline\ParserInterface
@@ -23,7 +24,7 @@ class Translate extends \Magento\Backend\App\Action
     /**
      * Authorization level of a basic admin session
      */
-    const ADMIN_RESOURCE = 'Magento_Backend::content_translation';
+    public const ADMIN_RESOURCE = 'Magento_Backend::content_translation';
 
     /**
      * @param Action\Context $context
@@ -52,8 +53,7 @@ public function execute()
         /** @var \Magento\Framework\Controller\Result\Json $resultJson */
         $resultJson = $this->resultJsonFactory->create();
         try {
-            $this->inlineParser->processAjaxPost($translate);
-            $response = ['success' => 'true'];
+            $response = $this->inlineParser->processAjaxPost($translate);
         } catch (\Exception $e) {
             $response = ['error' => 'true', 'message' => $e->getMessage()];
         }

app/code/Magento/Translation/Model/Inline/Parser.php

@@ -28,7 +28,7 @@ class Parser implements ParserInterface
     /**
      * data-translate html element attribute name
      */
-    const DATA_TRANSLATE = 'data-translate';
+    public const DATA_TRANSLATE = 'data-translate';
 
     /**
      * @var Escaper
@@ -426,7 +426,12 @@ private function _getTranslateData(string $regexp, string &$text, callable $loca
                     'location' => htmlspecialchars_decode($locationCallback($matches, $options)),
                 ]
             );
-            $text = substr_replace($text, $matches[1][0], $matches[0][1], strlen($matches[0][0]));
+
+            if (!str_contains($text, 'text/x-magento-init')) {
+                $text = substr_replace($text, $matches[1][0], $matches[0][1], strlen($matches[0][0]));
+            } else {
+                $text = substr_replace($text, $matches[3][0], $matches[0][1], strlen($matches[0][0]));
+            }
             $next = $matches[0][1];
         }
         return $trArr;

app/code/Magento/Translation/etc/di.xml

@@ -43,7 +43,6 @@
         <arguments>
             <argument name="renderers" xsi:type="array">
                 <item name="translation" xsi:type="object">Magento\Framework\Phrase\Renderer\Translate</item>
-                <item name="messageFormatter" xsi:type="object">Magento\Framework\Phrase\Renderer\MessageFormatter</item>
                 <item name="placeholder" xsi:type="object">Magento\Framework\Phrase\Renderer\Placeholder</item>
                 <item name="inline" xsi:type="object">Magento\Framework\Phrase\Renderer\Inline</item>
             </argument>

lib/internal/Magento/Framework/Phrase/Renderer/Inline.php

@@ -1,7 +1,5 @@
 <?php
 /**
- * Translate Inline Phrase renderer
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -12,6 +10,9 @@
 use Magento\Framework\Translate\Inline\ProviderInterface;
 use Psr\Log\LoggerInterface;
 
+/**
+ * Translate Inline Phrase renderer
+ */
 class Inline implements RendererInterface
 {
     /**

lib/internal/Magento/Framework/Phrase/Renderer/Translate.php

@@ -15,27 +15,35 @@
 class Translate implements RendererInterface
 {
     /**
-     * @var \Magento\Framework\TranslateInterface
+     * @var TranslateInterface
      */
     protected $translator;
 
     /**
-     * @var \Psr\Log\LoggerInterface
+     * @var LoggerInterface
      */
     protected $logger;
 
+    /**
+     * @var MessageFormatter
+     */
+    private $messageFormatter;
+
     /**
      * Renderer construct
      *
-     * @param \Magento\Framework\TranslateInterface $translator
-     * @param \Psr\Log\LoggerInterface $logger
+     * @param TranslateInterface $translator
+     * @param LoggerInterface $logger
+     * @param MessageFormatter $messageFormatter
      */
     public function __construct(
         TranslateInterface $translator,
-        LoggerInterface $logger
+        LoggerInterface $logger,
+        MessageFormatter $messageFormatter
     ) {
         $this->translator = $translator;
         $this->logger = $logger;
+        $this->messageFormatter = $messageFormatter;
     }
 
     /**
@@ -60,6 +68,8 @@ public function render(array $source, array $arguments)
             throw $e;
         }
 
-        return array_key_exists($text, $data) ? $data[$text] : end($source);
+        $source[] = array_key_exists($text, $data) ? $data[$text] : end($source);
+
+        return $this->messageFormatter->render($source, $arguments);
     }
 }

lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/TranslateTest.php

@@ -7,6 +7,7 @@
 
 namespace Magento\Framework\Phrase\Test\Unit\Renderer;
 
+use Magento\Framework\Phrase\Renderer\MessageFormatter;
 use Magento\Framework\Phrase\Renderer\Translate as PhraseRenderer;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\Translate;
@@ -32,18 +33,32 @@ class TranslateTest extends TestCase
      */
     protected $loggerMock;
 
+    /**
+     * @var MessageFormatter|MockObject
+     */
+    private $messageFormatter;
+
     protected function setUp(): void
     {
         $this->_translator = $this->getMockForAbstractClass(TranslateInterface::class);
         $this->loggerMock = $this->getMockBuilder(LoggerInterface::class)
             ->getMock();
+        $this->messageFormatter = $this->getMockBuilder(MessageFormatter::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->messageFormatter
+            ->method('render')
+            ->willReturnCallback(function ($source) {
+                return end($source);
+            });
 
         $objectManagerHelper = new ObjectManager($this);
         $this->_renderer = $objectManagerHelper->getObject(
             PhraseRenderer::class,
             [
                 'translator' => $this->_translator,
-                'logger' => $this->loggerMock
+                'logger' => $this->loggerMock,
+                'messageFormatter' => $this->messageFormatter,
             ]
         );
     }
@@ -96,7 +111,8 @@ public function testRenderException()
     {
         $message = 'something went wrong';
         $exception = new \Exception($message);
-
+        $this->messageFormatter->expects($this->never())
+            ->method('render');
         $this->_translator->expects($this->once())
             ->method('getData')
             ->willThrowException($exception);

lib/web/mage/translate-inline.js

@@ -18,7 +18,8 @@ define([
                 template: '#translate-form-template',
                 data: {
                     id: 'translate-inline-form',
-                    message: 'Please refresh the page to see your changes after submitting this form.'
+                    message: 'Please refresh the page to see your changes after submitting this form. ' +
+                        'Note: browser cache refresh may be required'
                 }
             },
             autoOpen: false,
@@ -157,9 +158,12 @@ define([
          * @private
          */
         _formSubmitComplete: function (response) {
+            var responseJSON = response.responseJSON || response;
+
             this.close();
             this.formIsSubmitted = false;
-            this._updatePlaceholder(response.responseJSON[this.data.items[0].original]);
+            $.mage.translate.add(responseJSON);
+            this._updatePlaceholder(responseJSON[this.data.items[0].original]);
         },
 
         /**
@@ -172,6 +176,7 @@ define([
 
             translateObject.shown = newValue;
             translateObject.translated = newValue;
+            $.mage.translate.add(this.data.items[0].original, newValue);
 
             $target.html(newValue);
         },