Unverified Commit b0acbeb5 authored by Nicolas Widart's avatar Nicolas Widart Committed by GitHub

Merge pull request #670 from motchju/master

Change due to version 1.3 of laravel-localization
parents 1c4f412a e94ebc30
<?php
namespace Modules\Core\Http\Middleware;
use Mcamara\LaravelLocalization\Middleware\LocaleSessionRedirect;
class LocaleSessionRedirectMiddleware extends LocaleSessionRedirect
{
}
...@@ -43,6 +43,7 @@ class CoreServiceProvider extends ServiceProvider ...@@ -43,6 +43,7 @@ class CoreServiceProvider extends ServiceProvider
'auth.admin' => 'AdminMiddleware', 'auth.admin' => 'AdminMiddleware',
'public.checkLocale' => 'PublicMiddleware', 'public.checkLocale' => 'PublicMiddleware',
'localizationRedirect' => 'LocalizationMiddleware', 'localizationRedirect' => 'LocalizationMiddleware',
'localeSessionRedirect' => 'LocaleSessionRedirectMiddleware',
'can' => 'Authorization', 'can' => 'Authorization',
], ],
]; ];
......
...@@ -55,7 +55,7 @@ abstract class RoutingServiceProvider extends ServiceProvider ...@@ -55,7 +55,7 @@ abstract class RoutingServiceProvider extends ServiceProvider
$router->group([ $router->group([
'namespace' => $this->namespace, 'namespace' => $this->namespace,
'prefix' => LaravelLocalization::setLocale(), 'prefix' => LaravelLocalization::setLocale(),
'middleware' => ['localizationRedirect', 'web'], 'middleware' => ['localeSessionRedirect', 'localizationRedirect', 'web'],
], function (Router $router) { ], function (Router $router) {
$this->loadBackendRoutes($router); $this->loadBackendRoutes($router);
$this->loadFrontendRoutes($router); $this->loadFrontendRoutes($router);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment