From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Sat, 3 Feb 2018 18:46:01 +0000 (-0500)
Subject: Use syntaxic sugar in L10n::t()
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=16cab7c6cef3df5774b638db11cec86067af0999;p=friendica.git

Use syntaxic sugar in L10n::t()
---

diff --git a/src/Core/L10n.php b/src/Core/L10n.php
index 215c6f6fb1..277b3401df 100644
--- a/src/Core/L10n.php
+++ b/src/Core/L10n.php
@@ -137,9 +137,10 @@ class L10n
 	 * - L10n::t('Current version: %s, new version: %s', $current_version, $new_version)
 	 *
 	 * @param string $s
+	 * @param array  $vars Variables to interpolate in the translation string
 	 * @return string
 	 */
-	public static function t($s)
+	public static function t($s, ...$vars)
 	{
 		$a = get_app();
 
@@ -147,9 +148,9 @@ class L10n
 			$t = $a->strings[$s];
 			$s = is_array($t) ? $t[0] : $t;
 		}
-		if (func_num_args() > 1) {
-			$args = array_slice(func_get_args(), 1);
-			$s = @vsprintf($s, $args);
+
+		if (count($vars) > 0) {
+			$s = sprintf($s, ...$vars);
 		}
 
 		return $s;