[-] Fix bug with locale redirection

madef · May 16, 2015 · 08e9754 · 08e9754
1 parent 6a882c8
commit 08e9754
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/src/Madef/CmsBundle/Controller/LanguageController.php b/src/Madef/CmsBundle/Controller/LanguageController.php
@@ -41,10 +41,16 @@ class LanguageController extends Controller
     public function adminRouteAction(Request $request)
     {
         $language = $request->getPreferredLanguage();
+
         if (empty($language)) {
             $language = 'en';
         }
 
+        if (strlen($language) > 2) {
+            $languages = explode('_', $language);
+            $language = $languages[0];
+        }
+
         return $this->redirect($this->generateUrl('madef_cms_admin_home', array('_locale' => $language)));
     }
 
@@ -56,10 +62,16 @@ public function adminRouteAction(Request $request)
     public function frontRouteAction(Request $request)
     {
         $language = $request->getPreferredLanguage();
+
         if (empty($language)) {
             $language = 'en';
         }
 
+        if (strlen($language) > 2) {
+            $languages = explode('_', $language);
+            $language = $languages[0];
+        }
+
         return $this->redirect($this->generateUrl('madef_cms_front_display_page', array('_locale' => $language)));
     }
 }