jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Next major version 2 with PHP 8.1, Symfony 6, Tabler UI, 2FA ... (#2902)

Browse Source
This commit is contained in:
Kevin Papst
2022-12-31 21:19:55 +01:00
committed by GitHub
parent 95e06746bd
commit 90a0fd8a22
2164 changed files with 83700 additions and 86426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/EventSubscriber/RedirectToLocaleSubscriber.php
View File

@@ -9,7 +9,7 @@
namespace App\EventSubscriber;
use App\Utils\LanguageService;
use App\Configuration\LocaleService;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpKernel\Event\RequestEvent;
@@ -24,15 +24,10 @@ use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
*
* @author Oleg Voronkovich <oleg-voronkovich@yandex.ru>
*/
class RedirectToLocaleSubscriber implements EventSubscriberInterface
final class RedirectToLocaleSubscriber implements EventSubscriberInterface
{
private $urlGenerator;
private $languageService;
public function __construct(UrlGeneratorInterface $urlGenerator, LanguageService $languageService)
public function __construct(private UrlGeneratorInterface $urlGenerator, private LocaleService $localeService)
{
$this->urlGenerator = $urlGenerator;
$this->languageService = $languageService;
}
public static function getSubscribedEvents(): array
@@ -42,7 +37,7 @@ class RedirectToLocaleSubscriber implements EventSubscriberInterface
];
}
public function onKernelRequest(RequestEvent $event)
public function onKernelRequest(RequestEvent $event): void
{
$request = $event->getRequest();
@@ -58,11 +53,11 @@ class RedirectToLocaleSubscriber implements EventSubscriberInterface
return;
}
$allLanguages = $this->languageService->getAllLanguages();
$allLanguages = $this->localeService->getAllLocales();
// Add the default locale at the first position of the array, because getPreferredLanguage()
// returns the first element when no appropriate language is found
array_unshift($allLanguages, $this->languageService->getDefaultLanguage());
array_unshift($allLanguages, $this->localeService->getDefaultLocale());
$preferredLanguage = $request->getPreferredLanguage(array_unique($allLanguages));