From 0b78307696e2c8f529a96d101d4df9ab2d6efa05 Mon Sep 17 00:00:00 2001 From: Ivo Valchev Date: Wed, 14 Apr 2021 13:40:45 +0200 Subject: [PATCH 1/2] Locale get link always `_locale` parameter --- src/Utils/LocaleHelper.php | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/src/Utils/LocaleHelper.php b/src/Utils/LocaleHelper.php index 3278673a9..2bff1b4a4 100644 --- a/src/Utils/LocaleHelper.php +++ b/src/Utils/LocaleHelper.php @@ -139,25 +139,7 @@ private function getContentLocales(): array private function getLink(string $route, array $routeParams, Collection $locale): string { - switch ($route) { - case 'record': - case 'homepage': - case 'listing': - case 'search': - case 'taxonomy': - $route = $route .= '_locale'; - // no break - case 'record_locale': - case 'homepage_locale': - case 'listing_locale': - case 'search_locale': - case 'taxonomy_locale': - $routeParams['_locale'] = $locale->get('code'); - - break; - default: - $routeParams['edit_locale'] = $locale->get('code'); - } + $routeParams['_locale'] = $locale->get('code'); return $this->urlGenerator->generate($route, $routeParams); } From 8c8492a264311d9ff196444da16c9ced097aad61 Mon Sep 17 00:00:00 2001 From: Ivo Valchev Date: Mon, 19 Apr 2021 13:58:20 +0200 Subject: [PATCH 2/2] For `bolt_content_edit`, set the `edit_locale` route param --- src/Utils/LocaleHelper.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Utils/LocaleHelper.php b/src/Utils/LocaleHelper.php index 2bff1b4a4..c2d2c5d0a 100644 --- a/src/Utils/LocaleHelper.php +++ b/src/Utils/LocaleHelper.php @@ -141,6 +141,11 @@ private function getLink(string $route, array $routeParams, Collection $locale): { $routeParams['_locale'] = $locale->get('code'); + if ($route === 'bolt_content_edit') { + unset($routeParams['_locale']); + $routeParams['edit_locale'] = $locale->get('code'); + } + return $this->urlGenerator->generate($route, $routeParams); }