fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-14 16:02:14 +09:00
Code Issues Projects Releases Packages Wiki Activity

Move string interpolation from __call() to get()

Browse source
This commit is contained in:
Kijin Sung 2016-03-17 14:11:33 +09:00
parent 09eb7935fa
commit 014e7f13a4
1 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

26
common/framework/lang.php
View file

@ -176,7 +176,19 @@ class Lang
{
$args = func_get_args();
array_shift($args);
return $this->__call($key, $args);
if (count($args) === 1 && is_array($args[0]))
{
$args = $args[0];
}
// Get the translation.
$translation = $this->__get($key);
// If there are no arguments, return the translation.
if (!count($args)) return $translation;
// If there are arguments, interpolate them into the translation and return the result.
return vsprintf($translation, $args);
}
/**
@ -338,16 +350,6 @@ class Lang
*/
public function __call($key, $args = array())
{
// Remove a colon from the beginning of the string.
if ($key !== '' && $key[0] === ':') $key = substr($key, 1);
// Find the translation.
$translation = $this->__get($key);
// If there are no arguments, return the translation.
if (!count($args)) return $translation;
// If there are arguments, interpolate them into the translation and return the result.
return vsprintf($translation, $args);
return $this->get($key, $args);
}
}