From bff6a5a9ee50e4d144275cb85ea45349d8a95e35 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Mon, 8 Aug 2022 01:51:42 -0400 Subject: [PATCH] Add support for additional interpolated variables in L10n->tt() --- src/Core/L10n.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Core/L10n.php b/src/Core/L10n.php index 2c45fb9551..db7ccbd2c6 100644 --- a/src/Core/L10n.php +++ b/src/Core/L10n.php @@ -303,11 +303,12 @@ class L10n * @param string $singular * @param string $plural * @param int $count + * @param array $vars Variables to interpolate in the translation string * * @return string * @throws \Exception */ - public function tt(string $singular, string $plural, int $count): string + public function tt(string $singular, string $plural, int $count, ...$vars): string { $s = null; @@ -340,7 +341,9 @@ class L10n $s = $singular; } - $s = @sprintf($s, $count); + // We mute errors here because the translation strings may not be referencing the count at all, + // but we still have to try the interpolation just in case it is indeed referenced. + $s = @sprintf($s, $count, ...$vars); return $s; }