diff --git a/config/services.yaml b/config/services.yaml
index e24f0f5..8f4a167 100644
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -26,6 +26,8 @@ services:
     # add more service definitions when explicit configuration is needed
     # please note that last definitions always *replace* previous ones
 
+    App\EventSubscriber\LocaleSubscriber:
+        arguments: ['%kernel.default_locale%']
 
     mastodon.api:
         class: App\Services\Mastodon_api
diff --git a/src/Controller/FediPlanController.php b/src/Controller/FediPlanController.php
index dcf2c23..d30e9d9 100644
--- a/src/Controller/FediPlanController.php
+++ b/src/Controller/FediPlanController.php
@@ -27,12 +27,15 @@ use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
 
+/**
+ * @Route("/{_locale}", defaults={"_locale":"en"})
+ */
 class FediPlanController extends AbstractController
 {
 
 
     /**
-     * @Route("/", name="index")
+     * @Route(name="index")
      */
     public function indexAction(Request $request, AuthorizationCheckerInterface $authorizationChecker, ConnectMastodonAccountFlow $flow, Mastodon_api $mastodon_api, TranslatorInterface $translator, EventDispatcherInterface $eventDispatcher)
     {
diff --git a/src/EventSubscriber/LocaleSubscriber.php b/src/EventSubscriber/LocaleSubscriber.php
new file mode 100644
index 0000000..8565d62
--- /dev/null
+++ b/src/EventSubscriber/LocaleSubscriber.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Created by fediplan.
+ * User: tom79
+ * Date: 21/08/19
+ * Time: 14:41
+ */
+
+namespace App\EventSubscriber;
+
+
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpKernel\Event\RequestEvent;
+use Symfony\Component\HttpKernel\KernelEvents;
+
+class LocaleSubscriber implements EventSubscriberInterface
+{
+    private $defaultLocale;
+
+    public function __construct($defaultLocale = 'en')
+    {
+        $this->defaultLocale = $defaultLocale;
+    }
+
+    public function onKernelRequest(RequestEvent $event)
+    {
+        $request = $event->getRequest();
+        if (!$request->hasPreviousSession()) {
+            return;
+        }
+
+        // try to see if the locale has been set as a _locale routing parameter
+        if ($locale = $request->attributes->get('_locale')) {
+            $request->getSession()->set('_locale', $locale);
+        } else {
+            // if no explicit locale has been set on this request, use one from the session
+            $request->setLocale($request->getSession()->get('_locale', $this->defaultLocale));
+        }
+    }
+
+    public static function getSubscribedEvents()
+    {
+        return [
+            // must be registered before (i.e. with a higher priority than) the default Locale listener
+            KernelEvents::REQUEST => [['onKernelRequest', 20]],
+        ];
+    }
+}
\ No newline at end of file