Skip to content

Commit 64260c8

Browse files
committed
Merge branch '7.2' into 7.3
* 7.2: remove an invalid test [Translation] fix support of `TranslatableInterface` in `IdentityTranslator` Fix various bool-type coercions
2 parents 18b1857 + df5717a commit 64260c8

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

TranslatableMessage.php

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,13 @@ public function getDomain(): ?string
4848

4949
public function trans(TranslatorInterface $translator, ?string $locale = null): string
5050
{
51-
return $translator->trans($this->getMessage(), array_map(
52-
static fn ($parameter) => $parameter instanceof TranslatableInterface ? $parameter->trans($translator, $locale) : $parameter,
53-
$this->getParameters()
54-
), $this->getDomain(), $locale);
51+
$parameters = $this->getParameters();
52+
foreach ($parameters as $k => $v) {
53+
if ($v instanceof TranslatableInterface) {
54+
$parameters[$k] = $v->trans($translator, $locale);
55+
}
56+
}
57+
58+
return $translator->trans($this->getMessage(), $parameters, $this->getDomain(), $locale);
5559
}
5660
}

0 commit comments

Comments
 (0)