From 44ce2783271ddaa6168046483cacee627b48c706 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20M=C3=A1tl?= Date: Thu, 8 Jun 2023 16:13:24 +0200 Subject: [PATCH] fix locale resolution doesn't happen with new versions of symphony translator --- src/Translator.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Translator.php b/src/Translator.php index 998c94de..a9af32a9 100644 --- a/src/Translator.php +++ b/src/Translator.php @@ -74,6 +74,11 @@ class Translator extends \Symfony\Component\Translation\Translator implements \K */ private $formatter; + /** + * @var bool + */ + private $localeResolved = false; + /** * @param \Kdyby\Translation\IUserLocaleResolver $localeResolver * @param \Symfony\Component\Translation\Formatter\MessageFormatterInterface $formatter @@ -348,8 +353,9 @@ public function setLocale($locale) */ public function getLocale() { - if (empty(parent::getLocale())) { + if (!$this->localeResolved) { $this->setLocale($this->localeResolver->resolve($this)); + $this->localeResolved = true; } return parent::getLocale();