From 26c8742ae8e89fec303b8061668a54e68ed54753 Mon Sep 17 00:00:00 2001
From: Ivo Valchev <Ivo.V.Valchev@gmail.com>
Date: Thu, 14 Jan 2021 13:15:49 +0100
Subject: [PATCH] Use default locale when not explicitly stated

---
 src/Event/Subscriber/LocaleSubscriber.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Event/Subscriber/LocaleSubscriber.php b/src/Event/Subscriber/LocaleSubscriber.php
index 7e9b8d8af..26b3f20fb 100644
--- a/src/Event/Subscriber/LocaleSubscriber.php
+++ b/src/Event/Subscriber/LocaleSubscriber.php
@@ -10,6 +10,14 @@
 
 class LocaleSubscriber implements EventSubscriberInterface
 {
+    /** @var string */
+    private $defaultLocale;
+
+    public function __construct(string $defaultLocale)
+    {
+        $this->defaultLocale = $defaultLocale;
+    }
+
     public function onKernelRequest(RequestEvent $event): void
     {
         $request = $event->getRequest();
@@ -29,9 +37,7 @@ public function onKernelRequest(RequestEvent $event): void
         } elseif ($request->attributes->get('zone', false) === 'backend' && $request->getSession()->has('_backend_locale')) {
             $request->setLocale($request->getSession()->get('_backend_locale'));
         } elseif ($request->getSession()->has('_locale')) {
-            // @todo: This is probably never reached. Remove if you're brave enough ;-)
-            // if no explicit locale has been set on this request, use one from the session
-            $request->setLocale($request->getSession()->get('_locale'));
+            $request->setLocale($this->defaultLocale);
         }
     }