Merge branch 'ACP2E-1602' of https://github.com/magento-l3/magento2ce into PR-02142023

Author: chittima

app/code/Magento/Theme/Block/Html/Header.php

@@ -57,7 +57,6 @@ public function getWelcome()
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
         }
-        $this->_data['welcome'] =  $this->escaper->escapeQuote($this->_data['welcome'], true);
-        return __($this->_data['welcome']);
+        return $this->escaper->escapeQuote(__($this->_data['welcome'])->render(), true);
     }
 }

app/code/Magento/Theme/Test/Unit/Block/Html/HeaderTest.php

@@ -58,13 +58,13 @@ public function testGetWelcomeDefault()
     {
         $this->scopeConfig->expects($this->once())->method('getValue')
             ->with('design/header/welcome', ScopeInterface::SCOPE_STORE)
-            ->willReturn('Welcome Message');
+            ->willReturn("Message d'accueil par défaut");
 
         $this->escaper->expects($this->once())
             ->method('escapeQuote')
-            ->with('Welcome Message', true)
-            ->willReturn('Welcome Message');
+            ->with("Message d'accueil par défaut", true)
+            ->willReturn("Message d\'accueil par défaut");
 
-        $this->assertEquals('Welcome Message', $this->unit->getWelcome());
+        $this->assertEquals("Message d\'accueil par défaut", $this->unit->getWelcome());
     }
 }