mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-30 19:30:25 +02:00
Code Issues Releases Wiki Activity

Finalise locations of language files, option to disable auto-load of English files on non-English sites if required files not found

Browse Source
This commit is contained in:
e107steved
2008-12-07 21:41:04 +00:00
parent 40418d08c9
commit dd282efc69
15 changed files with 141 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e107_admin/admin.php
View File

@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_admin/admin.php,v $
| $Revision: 1.5 $
| $Date: 2008-12-04 20:17:49 $
| $Revision: 1.6 $
| $Date: 2008-12-07 21:41:04 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
@@ -302,7 +302,7 @@ function getPluginLinks($iconSize = E_16_PLUGMANAGER, $linkStyle = 'adminb')
}
else
{
include_lan_admin($plugin_path);
loadLanFiles($plugin_path, 'admin');
$eplug_name = $tp->toHTML($readFile['@attributes']['name'],FALSE,"defs, emotes_off");
$eplug_conffile = $readFile['administration']['configFile'];
$eplug_icon_small = $plugin_path.'/'.$readFile['administration']['iconSmall'];

31
e107_admin/language.php
View File

@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_admin/language.php,v $
| $Revision: 1.10 $
| $Date: 2008-12-06 15:48:16 $
| $Revision: 1.11 $
| $Date: 2008-12-07 21:41:04 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
@@ -54,7 +54,8 @@ if (isset($_POST['submit_prefs']) && isset($_POST['mainsitelanguage']))
$temp['multilanguage'] = $_POST['multilanguage'];
$temp['multilanguage_subdomain'] = $_POST['multilanguage_subdomain'];
$temp['sitelanguage'] = $_POST['mainsitelanguage'];
$temp['noLanguageSubs'] = $_POST['noLanguageSubs'];
if ($admin_log->logArrayDiffs($temp, $pref, 'LANG_01'))
{
save_prefs(); // Only save if changes
@@ -179,9 +180,11 @@ if ($_POST['edit_existing'])
<div style='text-align:center'>
<table class='fborder' style='".ADMIN_WIDTH."'>\n";
foreach ($tabs as $table_name) {
foreach ($tabs as $table_name)
{
$installed = strtolower($_POST['lang_choices'])."_".$table_name;
if (stristr($_POST['lang_choices'], $installed) === FALSE) {
if (stristr($_POST['lang_choices'], $installed) === FALSE)
{
$text .= "<tr>
<td style='width:30%' class='forumheader3'>".ucfirst(str_replace("_", " ", $table_name))."</td>\n
<td style='width:70%' class='forumheader3'>\n";
@@ -228,7 +231,8 @@ if ($_POST['edit_existing'])
require_once(e_ADMIN."footer.php");
// ---------------------------------------------------------------------------
function multilang_prefs() {
function multilang_prefs()
{
global $ns, $pref,$lanlist;
$text = "<div style='text-align:center'>
@@ -245,7 +249,8 @@ function multilang_prefs() {
$text .= "
<select name='mainsitelanguage' class='tbox'>\n";
$sellan = preg_replace("/lan_*.php/i", "", $pref['sitelanguage']);
foreach($lanlist as $lan){
foreach($lanlist as $lan)
{
$sel = ($lan == $sellan) ? "selected='selected'" : "";
$text .= "<option value='{$lan}' {$sel}>".$lan."</option>\n";
}
@@ -259,7 +264,17 @@ function multilang_prefs() {
<td style='width:80%' class='forumheader3'>".LANG_LAN_12.": </td>
<td style='width:20%;text-align:center' class='forumheader3'>";
$checked = ($pref['multilanguage'] == 1) ? "checked='checked'" : "";
$text .= "<input type='checkbox' name='multilanguage' value='1' $checked />
$text .= "<input type='checkbox' name='multilanguage' value='1' {$checked} />
</td>
</tr>
";
$text .= "
<tr>
<td style='width:80%' class='forumheader3'>".LANG_LAN_26.": <br /><span class='smalltext'>".LANG_LAN_27."</span></td>
<td style='width:20%;text-align:center' class='forumheader3'>";
$checked = ($pref['noLanguageSubs'] == 1) ? "checked='checked'" : "";
$text .= "<input type='checkbox' name='noLanguageSubs' value='1' {$checked} />
</td>
</tr>
";