fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-07 18:51:41 +09:00
Code Issues Projects Releases Packages Wiki Activity

Keep translations from different sources separate

Browse source
This commit is contained in:
Kijin Sung 2016-02-01 13:30:15 +09:00
parent 4797e858b8
commit 5c1a68ae16
2 changed files with 150 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

14
classes/context/Context.class.php
View file

@ -339,8 +339,8 @@ class Context
// Load languages
$this->lang = Rhymix\Framework\Lang::getInstance($this->lang_type);
$this->lang->addDirectory(RX_BASEDIR . 'common/lang');
$this->lang->addDirectory(RX_BASEDIR . 'modules/module/lang');
$this->lang->loadDirectory(RX_BASEDIR . 'common/lang', 'common');
$this->lang->loadDirectory(RX_BASEDIR . 'modules/module/lang', 'module');
// set session handler
if(self::isInstalled() && $this->db_info->use_db_session == 'Y')
@ -915,7 +915,15 @@ class Context
*/
public static function loadLang($path)
{
return self::$_instance->lang->addDirectory($path);
if (preg_match('@/(modules|addons|plugins)/([a-z0-9_]+)/lang/?$@', str_replace('\\', '/', $path), $matches))
{
$plugin_name = $matches[2];
}
else
{
$plugin_name = null;
}
return self::$_instance->lang->loadDirectory($path, $plugin_name);
}
/**