File tree Expand file tree Collapse file tree 3 files changed +16
-9
lines changed Expand file tree Collapse file tree 3 files changed +16
-9
lines changed Original file line number Diff line number Diff line change @@ -26,10 +26,12 @@ In `config/admin.php`
26
26
],
27
27
// default locale
28
28
'default' => 'zh-CN',
29
- // if or not show multi-language login page, default is true
29
+ // if or not show multi-language login page, optional, default is true
30
30
'show-login-page' => true,
31
- // if or not show multi-language navbar, default is true
32
- 'show-navbar' => true
31
+ // if or not show multi-language navbar, optional, default is true
32
+ 'show-navbar' => true,
33
+ // the cookie name for the multi-language var, optional, default is 'locale'
34
+ 'cookie-name' => 'locale'
33
35
],
34
36
],
35
37
```
Original file line number Diff line number Diff line change @@ -14,18 +14,21 @@ class MultiLanguageController extends Controller
14
14
public function locale () {
15
15
$ locale = Request::input ('locale ' );
16
16
$ languages = MultiLanguage::config ('languages ' );
17
+
18
+ $ cookie_name = MultiLanguage::config ('cookie-name ' , 'locale ' );
17
19
if (array_key_exists ($ locale , $ languages )) {
18
20
19
- return response ('ok ' )->cookie (' locale ' , $ locale );
21
+ return response ('ok ' )->cookie ($ cookie_name , $ locale );
20
22
}
21
23
}
22
24
23
25
public function getLogin () {
24
26
$ languages = MultiLanguage::config ("languages " );
27
+ $ cookie_name = MultiLanguage::config ('cookie-name ' , 'locale ' );
25
28
26
29
$ current = MultiLanguage::config ('default ' );
27
- if (Cookie::has (' locale ' )) {
28
- $ current = Cookie::get (' locale ' );
30
+ if (Cookie::has ($ cookie_name )) {
31
+ $ current = Cookie::get ($ cookie_name );
29
32
}
30
33
return view ("multi-language::login " , compact ('languages ' , 'current ' ));
31
34
}
Original file line number Diff line number Diff line change @@ -12,12 +12,14 @@ class MultiLanguageMiddleware
12
12
public function handle ($ request , Closure $ next )
13
13
{
14
14
$ languages = MultiLanguage::config ('languages ' );
15
- if (Cookie::has ('locale ' ) && array_key_exists (Cookie::get ('locale ' ), $ languages )) {
16
- App::setLocale (Cookie::get ('locale ' ));
15
+ $ cookie_name = MultiLanguage::config ('cookie-name ' , 'locale ' );
16
+
17
+ if (Cookie::has ($ cookie_name ) && array_key_exists (Cookie::get ($ cookie_name ), $ languages )) {
18
+ App::setLocale (Cookie::get ($ cookie_name ));
17
19
} else {
18
20
$ default = MultiLanguage::config ('default ' );
19
21
App::setLocale ($ default );
20
22
}
21
23
return $ next ($ request );
22
24
}
23
- }
25
+ }
You can’t perform that action at this time.
0 commit comments