@@ -12,23 +12,21 @@ class LocaleCookieRedirect {
1212 * @param \Closure $next
1313 * @return mixed
1414 */
15- public function handle ($ request , Closure $ next ) {
16- $ params = explode ('/ ' , $ request ->path ());
17- $ locale = $ request ->cookie ('locale ' , false );
18-
19- if ($ locale !== false && (app ('laravellocalization ' )->getDefaultLocale () === $ locale && app ('laravellocalization ' )->hideDefaultLocaleInURL ())) {
20- $ redirection = app ('laravellocalization ' )->getLocalizedURL ($ locale );
21- $ redirectResponse = new RedirectResponse ($ redirection , 302 , ['Vary ' => 'Accept-Language ' ]);
22-
23- return $ redirectResponse ->withCookie (cookie ()->forever ('locale ' , $ params [0 ]));
24- }
25-
26- if (count ($ params ) > 0 && app ('laravellocalization ' )->checkLocaleInSupportedLocales ($ params [0 ])) {
27- cookie ('locale ' , $ params [0 ]);
28-
29- return $ next ($ request )->withCookie (cookie ()->forever ('locale ' , $ params [0 ]));
30- }
15+ public function handle ($ request , Closure $ next ) {
16+ $ params = explode ('/ ' , $ request ->path ());
17+ $ locale = $ request ->cookie ('locale ' , false );
18+
19+ if (count ($ params ) > 0 && app ('laravellocalization ' )->checkLocaleInSupportedLocales ($ params [0 ])) {
20+ return $ next ($ request )->withCookie (cookie ()->forever ('locale ' , $ params [0 ]));
21+ }
22+
23+ if ($ locale && !(app ('laravellocalization ' )->getDefaultLocale () === $ locale && app ('laravellocalization ' )->hideDefaultLocaleInURL ())) {
24+ $ redirection = app ('laravellocalization ' )->getLocalizedURL ($ locale );
25+ $ redirectResponse = new RedirectResponse ($ redirection , 302 , ['Vary ' => 'Accept-Language ' ]);
3126
32- return $ next ( $ request );
27+ return $ redirectResponse -> withCookie ( cookie ()-> forever ( ' locale ' , $ params [ 0 ]) );
3328 }
29+
30+ return $ next ($ request );
31+ }
3432}
0 commit comments