From dc0fd7538d7a4ce577940faaba7798ae70f000e3 Mon Sep 17 00:00:00 2001 From: John Esteban Astete Arambarri Date: Mon, 27 Jul 2020 02:59:33 -0300 Subject: [PATCH 1/2] Update Middleware.php When I need to add a prefix to some routes, like 'admin', for my backoffice, the $route->getPrefix() respond 'en/admin' instead of 'en' --- src/Middleware.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Middleware.php b/src/Middleware.php index 808a5b0..a3dbd40 100644 --- a/src/Middleware.php +++ b/src/Middleware.php @@ -18,7 +18,7 @@ class Middleware public function handle(Request $request, Closure $next) { $route = $request->route(); - $prefix = $route->getPrefix(); + $prefix = $request->segment(1); // Hide default locale /en to / if (config('loki.hideDefaultLocale') == true and $prefix == config('loki.defaultLocale')) { From 2593f7f63c8612c80a012574baa9158eee5ff820 Mon Sep 17 00:00:00 2001 From: John Esteban Astete Arambarri Date: Mon, 27 Jul 2020 03:22:01 -0300 Subject: [PATCH 2/2] Update UrlGenerator.php --- src/UrlGenerator.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/UrlGenerator.php b/src/UrlGenerator.php index e183a54..a6c2dc8 100644 --- a/src/UrlGenerator.php +++ b/src/UrlGenerator.php @@ -106,7 +106,7 @@ public function getLocalizedRoute($locale, $name = null, $parameters = [], $abso } $name = $route->getName(); - $prefix = $route->getPrefix(); + $prefix = request()->segment(1); // This is a fix for Laravel 6. // TODO: Maybe this is not needed anymore... $parameters = array_key_exists('data', $route->parameters) ? $route->parameters['data'] : $route->parameters; @@ -131,7 +131,7 @@ public function getLocalizedUrl($locale, $path = null, $extra = [], $secure = nu { if (is_null($path)) { $path = request()->path(); - $prefix = request()->route()->getPrefix(); + $prefix = request()->segment(1); if (!is_null($prefix)) { $path = Str::replaceFirst($prefix, '', $path);