[FEATURE] Allow language fallbacks #8

urbantrout · Mar 21, 2020 · 698baee · 698baee
1 parent c7c8ed4
commit 698baee
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/Classes/Middleware/RedirectionMiddleware.php b/Classes/Middleware/RedirectionMiddleware.php
@@ -105,6 +105,11 @@ protected function getRedirectResponseByBrowserLanguage(ServerRequestInterface $
         /** @var SiteLanguage[] $siteLanguages */
         $siteLanguages = $site->getLanguages();
 
+        $siteLanguagesFallbacks = [];
+        if (is_array($site->getConfiguration()['SiteLanguageRedirectionFallbacks']) && !empty($site->getConfiguration()['SiteLanguageRedirectionFallbacks'])) {
+            $siteLanguagesFallbacks = $site->getConfiguration()['SiteLanguageRedirectionFallbacks'];
+        }
+
         $acceptLanguages = $request->getHeader('accept-language');
         if (!empty($acceptLanguages)) {
             $acceptLanguages = array_unique(
@@ -133,7 +138,7 @@ protected function getRedirectResponseByBrowserLanguage(ServerRequestInterface $
         /** @var array $matchingSiteLanguageCodes Array in the form of: ['de-at', 'de', 'en'] */
         $matchingSiteLanguageCodes = array_filter(
             $acceptLanguagesWithFallbacks,
-            function ($language) use ($siteLanguages) {
+            function ($language) use ($siteLanguages, $siteLanguagesFallbacks) {
                 return in_array(
                     $language,
                     array_merge(
@@ -144,7 +149,10 @@ function ($language) use ($siteLanguages) {
                         array_map(function ($siteLanguage) {
                             /** @var SiteLanguage $siteLanguage */
                             return $siteLanguage->getTwoLetterIsoCode();
-                        }, $siteLanguages)
+                        }, $siteLanguages),
+                        array_map(function ($siteLanguagesFallback) {
+                            return $siteLanguagesFallback;
+                        }, array_keys($siteLanguagesFallbacks))
                     )
                 );
             }
@@ -153,10 +161,10 @@ function ($language) use ($siteLanguages) {
         /** @var SiteLanguage[] $matchingSiteLanguages */
         $matchingSiteLanguages = array_map(function ($item) {
             return array_shift($item);
-        }, array_map(function ($matchingSiteLanguageCode) use ($siteLanguages) {
-            return array_filter($siteLanguages, function ($siteLanguage) use ($matchingSiteLanguageCode) {
+        }, array_map(function ($matchingSiteLanguageCode) use ($siteLanguages, $siteLanguagesFallbacks) {
+            return array_filter($siteLanguages, function ($siteLanguage) use ($matchingSiteLanguageCode, $siteLanguagesFallbacks) {
                 /** @var SiteLanguage $siteLanguage */
-                return strtolower($siteLanguage->getHreflang()) === $matchingSiteLanguageCode || $siteLanguage->getTwoLetterIsoCode() === $matchingSiteLanguageCode;
+                return strtolower($siteLanguage->getHreflang()) === $matchingSiteLanguageCode || $siteLanguage->getTwoLetterIsoCode() === $matchingSiteLanguageCode || strtolower($siteLanguage->getHreflang()) === $siteLanguagesFallbacks[$matchingSiteLanguageCode] || $siteLanguage->getTwoLetterIsoCode() === $siteLanguagesFallbacks[$matchingSiteLanguageCode];
             });
         }, $matchingSiteLanguageCodes));