mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-04-21 13:11:52 +02:00
Code Issues Releases Wiki Activity

Issue #6 - Removed HTML from some language files. Removed some outdated language files.

Browse Source
This commit is contained in:
Cameron 2015-08-31 15:28:17 -07:00
parent 45f54ef16d
commit 6673575a82
9 changed files with 58 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
e107_admin/comment.php
View File

@ -15,7 +15,12 @@ if (!getperms("B"))
exit;
}
include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_prefs.php');
// include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_prefs.php');
e107::lan('core', 'comment');
e107::lan('core', 'prefs', true);
e107::css('inline', "td.status span.label { display:block; width: 100%; padding: 6px 6px; } ");
class comments_admin extends e_admin_dispatcher
{
@ -64,12 +69,12 @@ class comments_admin_ui extends e_admin_ui
protected $fields = array(
'checkboxes' => array('title'=> '', 'type' => null, 'width' =>'5%', 'forced'=> TRUE, 'thclass'=>'center', 'class'=>'center'),
'comment_id' => array('title'=> LAN_ID, 'type' => null, 'width' =>'5%', 'forced'=> TRUE),
'comment_blocked' => array('title'=> LAN_STATUS, 'type' => 'method', 'inline'=>false, /*'writeParms' => array("approved","blocked","pending"), */'data'=> 'int', 'thclass' => 'center', 'class'=>'center', 'filter' => true, 'batch' => true, 'width' => 'auto'), // Photo
'comment_blocked' => array('title'=> LAN_STATUS, 'type' => 'method', 'inline'=>false, /*'writeParms' => array("approved","blocked","pending"), */'data'=> 'int', 'thclass' => 'center', 'class'=>'status center', 'filter' => true, 'batch' => true, 'width' => 'auto'), // Photo
'comment_type' => array('title'=> LAN_TYPE, 'type' => 'method', 'width' => '10%', 'filter'=>TRUE),
'comment_item_id' => array('title'=> "item id", 'type' => 'text', 'data'=>'int', 'width' => '5%'),
'comment_subject' => array('title'=> "subject", 'type' => 'text', 'width' => 'auto', 'thclass' => 'left first'), // Display name
'comment_item_id' => array('title'=> "item id", 'type' => 'text', 'readonly'=>2, 'data'=>'int', 'width' => '5%'),
'comment_subject' => array('title'=> "subject", 'type' => 'text', 'width' => 'auto', 'thclass' => 'left first', 'writeParms'=>array('size'=>'xxlarge')), // Display name
'comment_comment' => array('title'=> "comment", 'type' => 'bbarea', 'width' => '30%', 'readParms' => 'expand=...&truncate=50&bb=1'), // Display name
'comment_author_id' => array('title'=> LAN_AUTHOR, 'type' => 'user', 'data' => 'int', 'width' => 'auto', 'writeParms' => 'nameField=comment_author_name'), // User id
'comment_author_name' => array('title'=> "authorName", 'type' => 'user', 'width' => 'auto', 'readParms'=>'idField=comment_author_id&link=1', 'noedit' => true, 'forceSave' => true), // User name
@ -173,14 +178,14 @@ class comments_admin_form_ui extends e_admin_form_ui
if($mode == 'read')
{
return e107::getComment()->getTable($curVal);
return $curVal.' (custom!)';
// return $curVal.' (custom!)';
}
if($mode == 'filter') // Custom Filter List for release_type
{
$sql = e107::getDb();
$sql->db_Select_gen('SELECT * FROM #comments GROUP BY comment_type');
while($row = $sql->db_Fetch())
$sql->gen('SELECT * FROM #comments GROUP BY comment_type');
while($row = $sql->fetch())
{
$id = $row['comment_type'];
$list[$id] = e107::getComment()->getTable($id);
@ -201,7 +206,8 @@ class comments_admin_form_ui extends e_admin_form_ui
{
$frm = e107::getForm();
$blocked = array("approved", "blocked", "pending");
// $blocked = array("approved", "blocked", "pending");
$blocked = array(COMLAN_400, COMLAN_401, COMLAN_402);
if($mode == 'filter' || $mode == 'batch' || $mode == 'inline') // Custom Filter List for release_type
{
@ -211,7 +217,14 @@ class comments_admin_form_ui extends e_admin_form_ui
if($mode == 'read')
{
// $blocked = array("","blocked","pending");
return varset($blocked[$curVal], ''); // $blocked[$curVal];
$blockedDisp = array(
"<span class='label label-success'>".COMLAN_400."</span>",
"<span class='label label-danger'>".COMLAN_401."</span>",
"<span class='label label-warning'>".COMLAN_402."</span>"
);
return varset($blockedDisp[$curVal], ''); // $blocked[$curVal];
}
if($mode == 'write')

27
e107_languages/English/admin/lan_modcomment.php
View File

@ -1,27 +0,0 @@
<?php
/*
* Copyright (C) 2008-2013 e107 Inc (e107.org), Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
*
* Admin Language File
*
*/
define("MDCLAN_1", "Moderated.");
define("MDCLAN_2", "No comments for this item");
define("MDCLAN_3", "Member");
define("MDCLAN_4", "Guest");
define("MDCLAN_5", "unblock");
define("MDCLAN_6", "block");
define("MDCLAN_8", "Moderate Comments");
define("MDCLAN_9", "Warning! Deleting Parent comments will also delete all replies!");
//define("MDCLAN_10", "options");//LAN_OPTIONS
define("MDCLAN_11", "comment");
define("MDCLAN_12", "comments");
define("MDCLAN_13", "blocked");
define("MDCLAN_14", "lock comments");
define("MDCLAN_15", "open");
define("MDCLAN_16", "locked");
?>

5
e107_languages/English/lan_comment.php
View File

@ -63,6 +63,11 @@ define("COMLAN_335", "Approved");
define("COMLAN_336", "Please write something first.");
define("COMLAN_337", "Updated successfully.");
define("COMLAN_400", "approved");
define("COMLAN_401", "blocked");
define("COMLAN_402", "pending");
define("COMLAN_TYPE_1", "news");
define("COMLAN_TYPE_2", "download");
define("COMLAN_TYPE_3", "faq");

2
e107_languages/English/lan_error.php
View File

@ -41,7 +41,7 @@ define("LAN_ERROR_24", " was unsuccessful.");
define("LAN_ERROR_25", "[1]: Unable to read core settings from database - Core settings exist but cannot be unserialized. Attempting to restore core backup ...");
define("LAN_ERROR_26", "[2]: Unable to read core settings from database - non-existent core settings.");
define("LAN_ERROR_27", "[3]: Core settings saved - backup made active.");
define("LAN_ERROR_28", "[4]: No core backup found. Check that your database has valid content. If not, please run the <a href='".e_FILE_ABS."resetcore/resetcore.php'>Reset_Core</a> utility to rebuild your core settings. <br />After rebuilding your core please save a backup from the admin/sql screen.");
define("LAN_ERROR_28", "[4]: No core backup found. Check that your database has valid content. ");
define("LAN_ERROR_29", "[5]: Field(s) have been left blank. Please resubmit the form and fill in the required fields.");
define("LAN_ERROR_30", "[6]: Unable to form a valid connection to mySQL. Please check that your e107_config.php contains the correct information.");
define("LAN_ERROR_31", "[7]: mySQL is running but database [x] couldn't be connected to.<br />Please check it exists and that your configuration file contains the correct information.");

19
e107_languages/English/lan_prefs.php
View File

@ -1,19 +0,0 @@
<?php
/*
+ ----------------------------------------------------------------------------+
| e107 website system - Language File.
|
| $Source: /cvs_backup/e107_0.8/e107_languages/English/lan_prefs.php,v $
| $Revision$
| $Date$
| $Author$
+----------------------------------------------------------------------------+
*/
define("LAN_PREF_1", "e107 Powered Website");
define("LAN_PREF_2", "e107 Website System");
define("LAN_PREF_3", "This site is powered by <a href=&quot;http://e107.org/&quot; rel=&quot;external&quot;>e107</a>, which is released under the terms of the <a href=&quot;http://www.gnu.org/&quot; rel=&quot;external&quot;>GNU</a> GPL License.");
define("LAN_PREF_4", "censored");
define("LAN_PREF_5", "Forums");
?>

30
e107_languages/English/lan_signup.php
View File

@ -2,17 +2,12 @@
/*
* e107 website system
*
* Copyright (C) 2008-2009 e107 Inc (e107.org)
* Copyright (C) 2008-2015 e107 Inc (e107.org)
* Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
*
* Language file - User signup
*
* $Source: /cvs_backup/e107_0.8/e107_languages/English/lan_signup.php,v $
* $Revision$
* $Date$
* $Author$
*
*/
define("PAGE_NAME", "Register");
@ -51,7 +46,7 @@ define("LAN_SIGNUP_9", "Unable to proceed.");
//define("LAN_SIGNUP_10", "Yes");
define("LAN_SIGNUP_11", ".");
define("LAN_SIGNUP_12", "please keep your username and password written down in a safe place as if lost they cannot be retrieved.");
define("LAN_SIGNUP_13", "You can now log in from the Login box, or from <a href='".e_BASE."login.php'>here</a>.");
define("LAN_SIGNUP_13", "You can now log in from the Login box, or from [here].");
define("LAN_SIGNUP_14", "here");
define("LAN_SIGNUP_15", "Please contact the main site admin");
define("LAN_SIGNUP_16", "if you require assistance.");
@ -122,7 +117,7 @@ define("LAN_SIGNUP_81", "Username: "); // LAN_9
define("LAN_SIGNUP_82", "the name that you use to login"); // LAN_10
define("LAN_SIGNUP_83", "Password: "); // LAN_17
define("LAN_SIGNUP_84", "Re-type Password: "); // LAN_111
define("LAN_SIGNUP_85", "Usernames and passwords are <b>case-sensitive</b>."); // LAN_400
define("LAN_SIGNUP_85", "Usernames and passwords are case-sensitive."); // LAN_400
//define("LAN_SIGNUP_86", "Email Address: "); // LAN_112 = LAN_USER_60
//define("LAN_SIGNUP_87", "Hide email address?: "); // LAN_113 = LAN_USER_83
//define("LAN_SIGNUP_88", "This will prevent your email address from being displayed on site"); // LAN_114
@ -157,24 +152,5 @@ define("LAN_SIGNUP_110", "Your full name");
define("LAN_SIGNUP_111", "Enter a URL to your image or choose an existing avatar.");
define("LAN_SIGNUP_112", "You are currently logged in as Main Admin.");
// BC for v1.x template
// //TODO Move into signup.php and use existing definition. eg. define("LAN_7", LAN_SIGNUP_89);
define("LAN_7", "Display Name: ");
define("LAN_8", "the name that will be displayed on site");
define("LAN_9", "Username: ");
define("LAN_10", "the name that you use to login");
define("LAN_17", "Password: ");
define("LAN_109", "This site complies with The Children's Online Privacy Protection Act of 1998 (COPPA) and as such cannot accept registrations from users under the age of 13 without a written permission document from their parent or guardian. For more information you can read the legislation");
define("LAN_111", "Re-type Password: ");
define("LAN_112", "Email Address: ");
define("LAN_113", "Hide email address?: ");
define("LAN_120", "Signature: ");
define("LAN_121", "Avatar: ");
define("LAN_122", "Timezone:");
define("LAN_123", "Register");
define("LAN_308", "Real Name: ");
define("LAN_309", "Please enter your details below.");
define("LAN_400", "Usernames and passwords are <b>case-sensitive</b>.");
define("LAN_410", "Enter code visible in the image");
?>

1
e107_languages/English/lan_usersettings.php
View File

@ -112,6 +112,7 @@ define("LAN_USET_42", "Mismatch on validation key");
define("LAN_USET_43", "Error updating user data");
// BC for v1.x template
//TODO Move to usersettings.php with bcDefs() method.
define("LAN_7", "Display Name: ");
define("LAN_8", "the name displayed on site");
define("LAN_9", "Username: ");

2
e107_plugins/social/admin_config.php
View File

@ -76,7 +76,7 @@ class social_ui extends e_admin_ui
protected $prefs = array(
'facebook_comments_limit' => array('title'=> 'Limit', 'type'=>'number', 'tab'=>1, 'data' => 'int','help'=>'Number of tweets to display.'),
'facebook_comments_limit' => array('title'=> 'Limit', 'type'=>'number', 'tab'=>1, 'data' => 'int','help'=>'Number of comments to display.'),
'facebook_comments_theme' => array('title'=> 'Theme', 'type'=>'dropdown', 'tab'=>1, 'writeParms'=>array('optArray'=>array('light'=>'Light','dark'=>'Dark')), 'data' => 'str','help'=>''),
'facebook_comments_loadingtext' => array('title'=> 'Text while loading', 'type'=>'text', 'tab'=>1, 'data' => 'str', 'writeParms'=>array('placeholder'=>'Loading...'), 'help'=>''),

26
signup.php
View File

@ -28,6 +28,29 @@ if($qs[0] != 'activate')
e107::coreLan('user'); // Generic user-related language defines
$bcLans = array(
"LAN_7"=> "LAN_SIGNUP_89", // "Display Name: ");
"LAN_8"=> "LAN_SIGNUP_90", // "the name that will be displayed on site");
"LAN_9"=> "LAN_SIGNUP_81", // "Username: ");
"LAN_10"=> "LAN_SIGNUP_82", // "the name that you use to login");
"LAN_17"=> "LAN_SIGNUP_83", // "Password: ");
"LAN_109"=> "LAN_SIGNUP_77", // "This site complies with The Children's Online Privacy Protection Act of 1998 (COPPA) and as such cannot accept registrations from users under the age of 13 without a written permission document from their parent or guardian. For more information you can read the legislation");
"LAN_111"=> "LAN_SIGNUP_84", // "Re-type Password: ");
"LAN_112"=> "LAN_USER_60", // "Email Address: ");
"LAN_113"=> "LAN_USER_83", // "Hide email address?: ");
"LAN_120"=> "LAN_USER_71", // "Signature: ");
"LAN_121"=> "LAN_SIGNUP_94", // "Avatar: ");
"LAN_122"=> "", // "Timezone:");
"LAN_123"=> "LAN_SIGNUP_79", // "Register");
"LAN_308"=> "LAN_SIGNUP_91", // "Real Name: ");
"LAN_309"=> "LAN_SIGNUP_80", // "Please enter your details below.");
"LAN_400"=> "LAN_SIGNUP_85", // "Usernames and passwords are <b>case-sensitive</b>.");
"LAN_410"=> "LAN_SIGNUP_95", // "Enter code visible in the image");
);
e107::getLanguage()->bcDefs($bcLans); // Backward compatibility fix.
define('SIGNUP_DEBUG', FALSE);
e107::js('core', 'jquery.mailcheck.min.js','jquery',2);
@ -950,7 +973,8 @@ if (isset($_POST['register']) && intval($pref['user_reg']) === 1)
}
else
{
$text = LAN_SIGNUP_76."&nbsp;".SITENAME.", ".LAN_SIGNUP_12."<br /><br />".LAN_SIGNUP_13;
$text = LAN_SIGNUP_76."&nbsp;".SITENAME.", ".LAN_SIGNUP_12."<br /><br />";
$text .= str_replace(array('[',']'), array("<a href='".e_BASE."login.php'>", "</a>"), LAN_SIGNUP_13);
}
$ns->tablerender(LAN_SIGNUP_8,$text);