ENGCOM-1928: 14294 - Fixes 'back' functionality after switching a store view. #15961. Fix functional tests.

Author: nmalevanec

app/code/Magento/Store/Block/Switcher.php

@@ -265,4 +265,24 @@ public function getTargetStorePostData(Store $store, $data = [])
             $data
         );
     }
+
+    /**
+     * Returns target store redirect url.
+     *
+     * @param Store $store
+     * @return string
+     */
+    public function getTargetStoreRedirectUrl(Store $store)
+    {
+        return $this->getUrl(
+            'stores/store/redirect',
+            [
+                '___store' => $store->getCode(),
+                '___from_store' => $this->getCurrentStoreCode(),
+                ActionInterface::PARAM_NAME_URL_ENCODED => $this->urlHelper->getEncodedUrl(
+                    $store->getCurrentUrl(false)
+                ),
+            ]
+        );
+    }
 }

app/code/Magento/Store/view/frontend/templates/switch/languages.phtml

@@ -27,7 +27,7 @@
             <?php foreach ($block->getStores() as $_lang): ?>
                 <?php if ($_lang->getId() != $block->getCurrentStoreId()): ?>
                     <li class="view-<?= $block->escapeHtml($_lang->getCode()) ?> switcher-option">
-                        <a href="<?= $block->escapeUrl($_lang->getCurrentUrl(true)) ?>">
+                        <a href="<?= $block->escapeUrl($block->getTargetStoreRedirectUrl($_lang)) ?>">
                             <?= $block->escapeHtml($_lang->getName()) ?>
                         </a>
                     </li>