MC-23553: Invalid Template Strings when Translate Inline enabled

Author: mastiuhin-olexandr

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

@@ -475,7 +475,7 @@ private function _prepareTagAttributesForContent(&$content)
                 } else {
                     $trAttr = ' ' . $this->_getHtmlAttribute(
                         self::DATA_TRANSLATE,
-                        '[' . str_replace("\"", "'", join(',', $trArr)) . ']'
+                        '[' . str_replace("\"", """, join(',', $trArr)) . ']'
                     );
                 }
                 $trAttr = $this->_addTranslateAttribute($trAttr);

app/code/Magento/Translation/Test/Unit/Model/Inline/ParserTest.php

@@ -147,12 +147,12 @@ public function testProcessResponseBodyStringProcessingAttributesCorrectly()
     {
         $testContent = file_get_contents(__DIR__ . '/_files/datatranslate_fixture.html');
         $processedAttributes = [
-            "data-translate=\"[{'shown':'* Required Fields','translated':'* Required Fields',"
-            . "'original':'* Required Fields','location':'Tag attribute (ALT, TITLE, etc.)'}]\"",
-            "data-translate=\"[{'shown':'Email','translated':'Email','original':'Email',"
-            . "'location':'Tag attribute (ALT, TITLE, etc.)'}]\"",
-            "data-translate=\"[{'shown':'Password','translated':'Password','original':'Password',"
-            . "'location':'Tag attribute (ALT, TITLE, etc.)'}]\""
+            "data-translate=\"[{"shown":"* Required Fields","translated":"* Required Fields","
+            . ""original":"* Required Fields","location":"Tag attribute (ALT, TITLE, etc.)"}]\"",
+            "data-translate=\"[{"shown":"Email","translated":"Email","original":"Email","
+            . ""location":"Tag attribute (ALT, TITLE, etc.)"}]\"",
+            "data-translate=\"[{"shown":"Password","translated":"Password","original":"Password","
+            . ""location":"Tag attribute (ALT, TITLE, etc.)"}]\""
         ];
         $this->translateInlineMock->method('getAdditionalHtmlAttribute')->willReturn(null);
 

lib/internal/Magento/Framework/Escaper.php

@@ -258,18 +258,17 @@ private function escapeAttributeValue($name, $value)
      */
     public function escapeHtmlAttr($string, $escapeSingleQuote = true)
     {
+        $string = (string)$string;
+
         if ($escapeSingleQuote) {
             $translateInline = $this->getTranslateInline();
 
-            if ($translateInline->isAllowed()) {
-                return $this->inlineSensitiveEscapeHthmlAttr((string) $string);
-            }
-
-            return $this->getEscaper()
-                ->escapeHtmlAttr((string) $string);
+            return $translateInline->isAllowed()
+                ? $this->inlineSensitiveEscapeHthmlAttr($string)
+                : $this->getEscaper()->escapeHtmlAttr($string);
         }
 
-        return htmlspecialchars((string)$string, $this->htmlSpecialCharsFlag, 'UTF-8', false);
+        return htmlspecialchars($string, $this->htmlSpecialCharsFlag, 'UTF-8', false);
     }
 
     /**