Upgrade to 3.3.5

2020-03-17 14:20:08 +01:00
parent 211e325864
commit 1f2f39ce58
19 changed files with 359 additions and 167 deletions
--- a/kirby/src/Cms/LanguageRoutes.php
+++ b/kirby/src/Cms/LanguageRoutes.php
@@ -78,6 +78,17 @@ class LanguageRoutes
                    ]);

                    if ($url->toString() !== $page->url()) {
+                        // redirect to translated page directly
+                        // if translation is exists and languages detect is enabled
+                        if (
+                            $kirby->option('languages.detect') === true &&
+                            $page->translation($kirby->detectedLanguage()->code())->exists() === true
+                        ) {
+                            return $kirby
+                                ->response()
+                                ->redirect($page->url($kirby->detectedLanguage()->code()));
+                        }
+
                        return $kirby
                            ->response()
                            ->redirect($page->url());