FRW-6369 Fixed issues with Dynamic Multistore. (#10757)

FRW-6369 Fixed issues with Dynamic Multistore.
spryker · Feb 12, 2024 · 104480d · 104480d
1 parent 5161726
commit 104480d
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/Spryker/Glue/Locale/Negotiator/LanguageNegotiator.php b/src/Spryker/Glue/Locale/Negotiator/LanguageNegotiator.php
@@ -60,7 +60,7 @@ public function getLanguageIsoCode(?string $headerAcceptLanguage = null): string
         }
 
         if (!$headerAcceptLanguage) {
-            return $this->getDefaultLanguage();
+            return $this->getDefaultLanguage($storeLocaleCodes);
         }
 
         foreach ($storeLocaleCodes as $localeName) {
@@ -72,21 +72,23 @@ public function getLanguageIsoCode(?string $headerAcceptLanguage = null): string
         $acceptLanguageTransfer = $this->localeService->getAcceptLanguage($headerAcceptLanguage, array_keys($storeLocaleCodes));
 
         if (!$acceptLanguageTransfer || $acceptLanguageTransfer->getType() === null) {
-            return $this->getDefaultLanguage();
+            return $this->getDefaultLanguage($storeLocaleCodes);
         }
 
         if (!isset($storeLocaleCodes[$acceptLanguageTransfer->getType()])) {
-            return $this->getDefaultLanguage();
+            return $this->getDefaultLanguage($storeLocaleCodes);
         }
 
         return $storeLocaleCodes[$acceptLanguageTransfer->getType()];
     }
 
     /**
+     * @param array<string, string> $storeLocaleCodes
+     *
      * @return string
      */
-    protected function getDefaultLanguage(): string
+    protected function getDefaultLanguage(array $storeLocaleCodes): string
     {
-        return $this->storeClient->getCurrentStore()->getDefaultLocaleIsoCodeOrFail();
+        return $this->storeClient->getCurrentStore()->getDefaultLocaleIsoCode() ?? (string)array_shift($storeLocaleCodes);
     }
 }