clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4388 from MrPetovan/develop 

Use syntaxic sugar in L10n::t()
This commit is contained in:
Michael Vogel 2018-02-03 22:12:36 +01:00 committed by GitHub
parent 3a7dd5e891 16cab7c6ce
commit d0c9e7939c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Core/L10n.php
View File

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