Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
Platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Platform
Commits
b0acbeb5
Unverified
Commit
b0acbeb5
authored
Feb 10, 2019
by
Nicolas Widart
Committed by
GitHub
Feb 10, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #670 from motchju/master
Change due to version 1.3 of laravel-localization
parents
1c4f412a
e94ebc30
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
1 deletion
+11
-1
LocaleSessionRedirectMiddleware.php
.../Core/Http/Middleware/LocaleSessionRedirectMiddleware.php
+9
-0
CoreServiceProvider.php
Modules/Core/Providers/CoreServiceProvider.php
+1
-0
RoutingServiceProvider.php
Modules/Core/Providers/RoutingServiceProvider.php
+1
-1
No files found.
Modules/Core/Http/Middleware/LocaleSessionRedirectMiddleware.php
0 → 100644
View file @
b0acbeb5
<?php
namespace
Modules\Core\Http\Middleware
;
use
Mcamara\LaravelLocalization\Middleware\LocaleSessionRedirect
;
class
LocaleSessionRedirectMiddleware
extends
LocaleSessionRedirect
{
}
Modules/Core/Providers/CoreServiceProvider.php
View file @
b0acbeb5
...
@@ -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'
,
],
],
];
];
...
...
Modules/Core/Providers/RoutingServiceProvider.php
View file @
b0acbeb5
...
@@ -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'
=>
[
'local
eSessionRedirect'
,
'local
izationRedirect'
,
'web'
],
],
function
(
Router
$router
)
{
],
function
(
Router
$router
)
{
$this
->
loadBackendRoutes
(
$router
);
$this
->
loadBackendRoutes
(
$router
);
$this
->
loadFrontendRoutes
(
$router
);
$this
->
loadFrontendRoutes
(
$router
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment