fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-22 05:15:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

Allow plugin name in language keys

Browse source
This commit is contained in:
Kijin Sung 2016-02-01 13:43:14 +09:00
parent 5c1a68ae16
commit 693fce7601
1 changed files with 31 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

37
common/framework/lang.php
View file

@ -256,11 +256,41 @@ class Lang
return (include RX_BASEDIR . 'common/defaults/lang.php'); return (include RX_BASEDIR . 'common/defaults/lang.php');
} }
/**
* Generic getter.
*
* @param string $key
* @return string
*/
public function get($key)
{
$args = func_get_args();
array_shift($args);
return $this->__call($key, $args);
}
/** /**
* Magic method for translations without arguments. * Magic method for translations without arguments.
*
* @param string $key
* @return string
*/ */
public function __get($key) public function __get($key)
{ {
// Separate the plugin name from the key.
if (($keys = explode('.', $key, 2)) && count($keys) === 2)
{
list($plugin_name, $key) = $keys;
if (isset($this->_loaded_plugins[$plugin_name]->{$key}))
{
return $this->_loaded_plugins[$plugin_name]->{$key};
}
else
{
return $key;
}
}
// Search custom translations first. // Search custom translations first.
if (isset($this->_loaded_plugins['_custom_']->{$key})) if (isset($this->_loaded_plugins['_custom_']->{$key}))
{ {
@ -334,7 +364,7 @@ class Lang
* @param mixed $args * @param mixed $args
* @return string|null * @return string|null
*/ */
public function __call($key, $args) public function __call($key, $args = array())
{ {
// Remove a colon from the beginning of the string. // Remove a colon from the beginning of the string.
if ($key !== '' && $key[0] === ':') $key = substr($key, 1); if ($key !== '' && $key[0] === ':') $key = substr($key, 1);
@ -343,11 +373,6 @@ class Lang
$translation = $this->__get($key); $translation = $this->__get($key);
// If there are no arguments, return the translation. // If there are no arguments, return the translation.
if (!is_array($args))
{
$args = func_get_args();
array_shift($args);
}
if (!count($args)) return $translation; if (!count($args)) return $translation;
// If there are arguments, interpolate them into the translation and return the result. // If there are arguments, interpolate them into the translation and return the result.