X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FL10n.php;h=24be0109554b2e4ba0a02e98502ffbddc4a83e2a;hb=3e797547a37f8c8f22e88965b4a4d278bcc192e0;hp=215c6f6fb11c1c9a682a22c473d4618a145fecdd;hpb=208a149a7b7e25dc84c39e5631cba11d41869bae;p=friendica.git diff --git a/src/Core/L10n.php b/src/Core/L10n.php index 215c6f6fb1..24be010955 100644 --- a/src/Core/L10n.php +++ b/src/Core/L10n.php @@ -137,19 +137,24 @@ 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(); + if (empty($s)) { + return ''; + } + if (x($a->strings, $s)) { $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;