MC-20622: Email sent from admin order edit includes incorrect static file paths

- Fix unable to set local though \Magento\Backend\Model\Locale\Resolver::setLocale()

Author: bubasuma

app/code/Magento/Backend/Model/Locale/Resolver.php

@@ -7,8 +7,10 @@
 
 /**
  * Backend locale model
+ *
  * @api
  * @since 100.0.2
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class Resolver extends \Magento\Framework\Locale\Resolver
 {
@@ -40,7 +42,7 @@ class Resolver extends \Magento\Framework\Locale\Resolver
      * @param Manager $localeManager
      * @param \Magento\Framework\App\RequestInterface $request
      * @param \Magento\Framework\Validator\Locale $localeValidator
-     * @param null $locale
+     * @param string|null $locale
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -76,7 +78,7 @@ public function setLocale($locale = null)
         $sessionLocale = $this->_session->getSessionLocale();
         $userLocale = $this->_localeManager->getUserInterfaceLocale();
 
-        $localeCodes = array_filter([$forceLocale, $sessionLocale, $userLocale]);
+        $localeCodes = array_filter([$forceLocale, $locale, $sessionLocale, $userLocale]);
 
         if (count($localeCodes)) {
             $locale = reset($localeCodes);

dev/tests/integration/testsuite/Magento/Backend/Model/Locale/ResolverTest.php

@@ -20,6 +20,9 @@ class ResolverTest extends \PHPUnit\Framework\TestCase
      */
     protected $_model;
 
+    /**
+     * {@inheritDoc}
+     */
     protected function setUp()
     {
         parent::setUp();
@@ -29,15 +32,15 @@ protected function setUp()
     }
 
     /**
-     * @covers \Magento\Backend\Model\Locale\Resolver::setLocale
+     * Tests setLocale() with default locale
      */
     public function testSetLocaleWithDefaultLocale()
     {
         $this->_checkSetLocale(Resolver::DEFAULT_LOCALE);
     }
 
     /**
-     * @covers \Magento\Backend\Model\Locale\Resolver::setLocale
+     * Tests setLocale() with interface locale
      */
     public function testSetLocaleWithBaseInterfaceLocale()
     {
@@ -55,7 +58,7 @@ public function testSetLocaleWithBaseInterfaceLocale()
     }
 
     /**
-     * @covers \Magento\Backend\Model\Locale\Resolver::setLocale
+     * Tests setLocale() with session locale
      */
     public function testSetLocaleWithSessionLocale()
     {
@@ -68,7 +71,7 @@ public function testSetLocaleWithSessionLocale()
     }
 
     /**
-     * @covers \Magento\Backend\Model\Locale\Resolver::setLocale
+     * Tests setLocale() with post parameter
      */
     public function testSetLocaleWithRequestLocale()
     {
@@ -78,13 +81,45 @@ public function testSetLocaleWithRequestLocale()
         $this->_checkSetLocale('de_DE');
     }
 
+    /**
+     * Tests setLocale() with parameter
+     *
+     * @param string|null $localeParam
+     * @param string|null $localeRequestParam
+     * @param string $localeExpected
+     * @dataProvider setLocaleWithParameterDataProvider
+     */
+    public function testSetLocaleWithParameter(
+        ?string $localeParam,
+        ?string $localeRequestParam,
+        string $localeExpected
+    ) {
+        $request = Bootstrap::getObjectManager()
+            ->get(\Magento\Framework\App\RequestInterface::class);
+        $request->setPostValue(['locale' => $localeRequestParam]);
+        $this->_model->setLocale($localeParam);
+        $this->assertEquals($localeExpected, $this->_model->getLocale());
+    }
+
+    /**
+     * @return array
+     */
+    public function setLocaleWithParameterDataProvider(): array
+    {
+        return [
+            ['ko_KR', 'ja_JP', 'ja_JP'],
+            ['ko_KR', null, 'ko_KR'],
+            [null, 'ja_JP', 'ja_JP'],
+        ];
+    }
+
     /**
      * Check set locale
      *
      * @param string $localeCodeToCheck
      * @return void
      */
-    protected function _checkSetLocale($localeCodeToCheck)
+    private function _checkSetLocale($localeCodeToCheck)
     {
         $this->_model->setLocale();
         $localeCode = $this->_model->getLocale();