From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Mon, 8 Aug 2022 05:51:42 +0000 (-0400)
Subject: Add support for additional interpolated variables in L10n->tt()
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=bff6a5a9ee50e4d144275cb85ea45349d8a95e35;p=friendica.git

Add support for additional interpolated variables in L10n->tt()
---

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;
 	}