Fix locale

app/config/sonata/sonata_translation.yml

@@ -1,8 +1,9 @@
 lunetics_locale:
     guessing_order:
+        - session
         - query
         - router
-        - session
+
         #- browser
 
     allowed_locales: '%locales%'

src/Chamilo/CoreBundle/EventListener/LegacyLoginListener.php

@@ -60,6 +60,20 @@ class LegacyLoginListener implements EventSubscriberInterface
                             $completeUser = $this->container->get('doctrine')->getRepository('ChamiloUserBundle:User')->findOneBy($criteria);
                             $user->setLanguage($completeUser->getLanguage());
 
+                            $languages = ['german' => 'de', 'english' => 'en', 'spanish' => 'es', 'french' => 'fr'];
+
+                            if ($user && isset($languages[$user->getLanguage()])) {
+                                $locale = $languages[$user->getLanguage()];
+                                $user->setLocale($locale);
+
+                                $request->getSession()->set('_locale_user', $locale);
+
+                                // if no explicit locale has been set on this request, use one from the session
+                                $request->setLocale($locale);
+                                $request->getSession()->set('_locale', $locale);
+
+                            }
+
                             $token = new UsernamePasswordToken($user, null, "main", $user->getRoles());
 
                             $this->tokenStorage->setToken($token); //now the user is logged in

src/Chamilo/CoreBundle/EventListener/UserLocaleListener.php

@@ -51,6 +51,7 @@ class UserLocaleListener
 
         if ($token) {
             $user = $token->getUser();
+
             if ($user && isset($languages[$user->getLanguage()])) {
                 $user->setLocale($languages[$user->getLanguage()]);
                 $this->session->set('_locale', $user->getLocale());