Fix locale undefined and updated version

Author: Marc Cámara García

composer.json

@@ -4,7 +4,7 @@
     "keywords": ["localization", "laravel", "php"],
     "homepage": "https://github.com/mcamara/laravel-localization",
     "license": "MIT",
-    "version": "1.0.11",
+    "version": "1.0.12",
     "authors": [
         {
             "name": "Marc Cámara",

src/Mcamara/LaravelLocalization/Middleware/LocaleCookieRedirect.php

@@ -17,6 +17,7 @@ class LocaleCookieRedirect implements Middleware {
     public function handle( $request, Closure $next )
     {
         $params = explode('/', $request->path());
+        $locale = $request->cookie('locale', false);
 
         if ( count($params) > 0 && $locale = app('laravellocalization')->checkLocaleInSupportedLocales($params[ 0 ]) )
         {
@@ -25,8 +26,6 @@ public function handle( $request, Closure $next )
             return $next($request);
         }
 
-        $locale = $request->cookie('locale', false);
-
         if ( $locale && !( app('laravellocalization')->getDefaultLocale() === $locale && app('laravellocalization')->hideDefaultLocaleInURL() ) )
         {
             app('session')->reflash();
@@ -37,4 +36,4 @@ public function handle( $request, Closure $next )
 
         return $next($request);
     }
-}
+}

src/Mcamara/LaravelLocalization/Middleware/LocaleSessionRedirect.php

@@ -16,6 +16,7 @@ class LocaleSessionRedirect implements Middleware {
     public function handle( $request, Closure $next )
     {
         $params = explode('/', $request->path());
+        $locale = session('locale', false);
 
         if ( count($params) > 0 && $locale = app('laravellocalization')->checkLocaleInSupportedLocales($params[ 0 ]) )
         {
@@ -24,8 +25,6 @@ public function handle( $request, Closure $next )
             return $next($request);
         }
 
-        $locale = session('locale', false);
-
         if ( $locale && app('laravellocalization')->checkLocaleInSupportedLocales($locale) && !( app('laravellocalization')->getDefaultLocale() === $locale && app('laravellocalization')->hideDefaultLocaleInURL() ) )
         {
             app('session')->reflash();