mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 20:58:30 +01:00
Code Issues Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
e107_admin/language.php
View File

@ -45,6 +45,7 @@ if (isset($_POST['submit_prefs']) && isset($_POST['mainsitelanguage']))
$temp['multilanguage_subdomain'] = $_POST['multilanguage_subdomain'];
$temp['multilanguage_domain'] = $_POST['multilanguage_domain'];
$temp['sitelanguage'] = $_POST['mainsitelanguage'];
$temp['adminlanguage'] = $_POST['mainadminlanguage'];
$temp['noLanguageSubs'] = $_POST['noLanguageSubs'];
if ($admin_log->logArrayDiffs($temp, $pref, 'LANG_01'))
{
@ -481,7 +482,29 @@ function multilang_prefs()
$text .= $frm->select('mainsitelanguage',$lanlist,$sellan,"useValues=1");
$text .= "
</td>
</tr>
</tr>";
if(isset($_SERVER['E_DEV_LANGUAGE']) && $_SERVER['E_DEV_LANGUAGE'] === 'true')
{
$text .= "
<tr>
<td>".LANG_LAN_50.": </td>
<td>";
$sellan = preg_replace("/lan_*.php/i", "", $pref['adminlanguage']);
$text .= $frm->select('mainadminlanguage',$lanlist,$sellan,array("useValues"=>1,"default" => LANG_LAN_14));
$text .= "
</td>
</tr>";
}
$text .= "
<tr>
<td>".LANG_LAN_12.": </td>
<td>

1
e107_core/xml/default_install.xml
View File

@ -6,6 +6,7 @@
<core name="admin_separate_plugins">0</core>
<core name="admincode">0</core>
<core name="admincss">admin_dark.css</core>
<core name="adminlanguage"></core>
<core name="adminpwordchange">0</core>
<core name="adminstyle">infopanel</core>
<core name="admintheme">bootstrap</core>

2
e107_handlers/e107_class.php
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);

4
e107_handlers/language_class.php
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)
@ -532,7 +532,7 @@ class language{
}
else
{
$user_language = $pref['sitelanguage'];
$user_language = (e_ADMIN_AREA && vartrue($pref['adminlanguage'])) ? $pref['adminlanguage'] : $pref['sitelanguage'];
if($session->is('e_language'))
{

2
e107_languages/English/admin/lan_language.php
View File

@ -50,4 +50,6 @@ define("LANG_LAN_34", "Available Language Packs");
define("LANG_LAN_35", "The following language packs are available for this version of e107.");
define("LANG_LAN_36", "Language-Pack errors found! Please first verify your language files are without errors, before creating a language-pack.");
define("LANG_LAN_50", "Admin-Area Interface Language");
?>