fix locale resolution doesn't happen with new versions of symphony tr…

…anslator
matlad · Jun 9, 2023 · 44ce278 · 44ce278
1 parent 2bc453b
commit 44ce278
Showing 1 changed file with 7 additions and 1 deletion.
diff --git 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();