From 0e473f0f370ddcd7ce39c2cd692f1df2ea3b9116 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 10 Nov 2020 22:13:01 +0100 Subject: [PATCH] simplify getLanguage call in request --- Controller/BackendController.php | 2 +- Controller/SearchController.php | 4 ++-- Controller/TimerecordingController.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 46f9bd8..181614c 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -115,7 +115,7 @@ final class BackendController extends Controller public function loadLanguage(RequestAbstract $request, ResponseAbstract $response) : void { $languages = $this->app->moduleManager->getLanguageFiles($request); - $langCode = $response->getHeader()->getL11n()->getLanguage(); + $langCode = $response->getLanguage(); foreach ($languages as $path) { $path = __DIR__ . '/../../..' . $path . '.' . $langCode . '.lang.php'; diff --git a/Controller/SearchController.php b/Controller/SearchController.php index 8396ffe..9589e9f 100755 --- a/Controller/SearchController.php +++ b/Controller/SearchController.php @@ -68,7 +68,7 @@ final class SearchController extends Controller } $name = \mb_strtolower($this->app->l11nManager->getText( - $response->getHeader()->getL11n()->getLanguage() ?? 'en', + $response->getLanguage() ?? 'en', 'Navigation', '0', $element->name, )); @@ -109,7 +109,7 @@ final class SearchController extends Controller private function loadLanguage(RequestAbstract $request, ResponseAbstract $response, string $app) : void { $languages = $this->app->moduleManager->getLanguageFiles($request, $app); - $langCode = $response->getHeader()->getL11n()->getLanguage(); + $langCode = $response->getLanguage(); foreach ($languages as $path) { $path = __DIR__ . '/../../..' . $path . '.' . $langCode . '.lang.php'; diff --git a/Controller/TimerecordingController.php b/Controller/TimerecordingController.php index 59af48b..c3e4ee2 100755 --- a/Controller/TimerecordingController.php +++ b/Controller/TimerecordingController.php @@ -110,7 +110,7 @@ final class TimerecordingController extends Controller public function loadLanguage(RequestAbstract $request, ResponseAbstract $response) : void { $languages = $this->app->moduleManager->getLanguageFiles($request); - $langCode = $response->getHeader()->getL11n()->getLanguage(); + $langCode = $response->getLanguage(); foreach ($languages as $path) { $path = __DIR__ . '/../../..' . $path . '.' . $langCode . '.lang.php';