1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-12 09:34:54 +02:00

Issue #385 and admin-language interface pref added. (requires testing)

This commit is contained in:
Cameron
2013-07-17 03:01:46 -07:00
parent a669804a89
commit d55c60ba1d
5 changed files with 31 additions and 5 deletions

View File

@@ -2277,7 +2277,7 @@ class e107
{
return FALSE;
}
$path = str_replace(e_LANGUAGE, 'English', $path);
// $path = str_replace(e_LANGUAGE, 'English', $path);
self::getMessage()->addDebug("Couldn't load language file: ".$path);
}
$ret = ($force) ? include($path) : include_once($path);

View File

@@ -268,7 +268,7 @@ class language{
if(!$lang)
{
return $pref['sitelanguage'];
return (ADMIN_AREA && vartrue($pref['adminlanguage'])) ? $pref['adminlanguage'] : $pref['sitelanguage'];
}
if(strpos($lang,"debug")!==FALSE)
@@ -531,8 +531,8 @@ class language{
$session->set('e_language', $user_language);
}
else
{
$user_language = $pref['sitelanguage'];
{
$user_language = (e_ADMIN_AREA && vartrue($pref['adminlanguage'])) ? $pref['adminlanguage'] : $pref['sitelanguage'];
if($session->is('e_language'))
{