X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FL10n.php;h=0f879c494848ae6c73239b9b922dd8e194dfaea9;hb=a145712f042f54c1e4ce657be1ab8c649ea2f6f8;hp=355b1b1c49934867f31eecdf126c8683922ad7d1;hpb=5ece6dcf41201c6c73dbb2269b2261a93048cc33;p=friendica.git

diff --git a/src/Core/L10n.php b/src/Core/L10n.php
index 355b1b1c49..0f879c4948 100644
--- a/src/Core/L10n.php
+++ b/src/Core/L10n.php
@@ -304,11 +304,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;
 
@@ -341,7 +342,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;
 	}
@@ -426,32 +429,6 @@ class L10n
 		return $ret;
 	}
 
-	/**
-	 * Load poke verbs
-	 *
-	 * @return array index is present tense verb
-	 *                 value is array containing past tense verb, translation of present, translation of past
-	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
-	 * @hook poke_verbs pokes array
-	 */
-	public function getPokeVerbs(): array
-	{
-		// index is present tense verb
-		// value is array containing past tense verb, translation of present, translation of past
-		$arr = [
-			'poke'   => ['poked', $this->t('poke'), $this->t('poked')],
-			'ping'   => ['pinged', $this->t('ping'), $this->t('pinged')],
-			'prod'   => ['prodded', $this->t('prod'), $this->t('prodded')],
-			'slap'   => ['slapped', $this->t('slap'), $this->t('slapped')],
-			'finger' => ['fingered', $this->t('finger'), $this->t('fingered')],
-			'rebuff' => ['rebuffed', $this->t('rebuff'), $this->t('rebuffed')],
-		];
-
-		Hook::callAll('poke_verbs', $arr);
-
-		return $arr;
-	}
-
 	/**
 	 * Creates a new L10n instance based on the given langauge
 	 *