Merge pull request #1382 from MikeyGMT/master

Issue #6 Replace LAN_nnn's with generic LAN_SUMMARY, LAN_SHOW, LAN_INCORRECT_PASSWORD
2025-01-18 05:09:05 +01:00 · 2016-02-24 14:32:05 -08:00 · 2016-02-24 14:32:05 -08:00 · 64fbcfd689
commit 64fbcfd689
parent 7376e8e40e 7b12fdfb00
14 changed files with 21 additions and 20 deletions
--- a/e107_admin/fileinspector.php
+++ b/e107_admin/fileinspector.php
@ -202,7 +202,7 @@ class file_inspector {
 		
 		$text .= "<tr>
 		<td style='width: 35%'>
-		".FC_LAN_3." ".FC_LAN_5.":
+		".LAN_SHOW." ".FC_LAN_5.":
 		</td>
 		<td colspan='2' style='width: 65%'>".$frm->select('core',$coreOpts,$_POST['core'])."	</td>
 		</tr>";
@ -221,7 +221,7 @@ class file_inspector {
 		
 		$text .= "<tr>
 		<td style='width: 35%'>
-		".FC_LAN_3." ".FC_LAN_13.":
+		".LAN_SHOW." ".FC_LAN_13.":
 		</td>
 		<td colspan='2' style='width: 65%'>
 		<input type='radio' name='missing' value='1'".(($_POST['missing'] == '1' || !isset($_POST['missing'])) ? " checked='checked'" : "")." /> ".FC_LAN_9."&nbsp;&nbsp;
@ -231,7 +231,7 @@ class file_inspector {
 		
 		$text .= "<tr>
 		<td style='width: 35%'>
-		".FC_LAN_3." ".FC_LAN_7.":
+		".LAN_SHOW." ".FC_LAN_7.":
 		</td>
 		<td colspan='2' style='width: 65%'>
 		<input type='radio' name='noncore' value='1'".(($_POST['noncore'] == '1' || !isset($_POST['noncore'])) ? " checked='checked'" : "")." /> ".FC_LAN_9."&nbsp;&nbsp;
@ -243,7 +243,7 @@ class file_inspector {
 		
 		$text .= "<tr>
 		<td style='width: 35%'>
-		".FC_LAN_3." ".FC_LAN_21.":
+		".LAN_SHOW." ".FC_LAN_21.":
 		</td>
 		<td colspan='2' style='width: 65%'>
 		<input type='radio' name='oldcore' value='1'".(($_POST['oldcore'] == '1' || !isset($_POST['oldcore'])) ? " checked='checked'" : "")." /> ".FC_LAN_9."&nbsp;&nbsp;
--- a/e107_admin/newspost.php
+++ b/e107_admin/newspost.php
@ -397,7 +397,7 @@ class news_admin_ui extends e_admin_ui
 		'news_id'				=> array('title' => LAN_ID, 	    'type' => 'text', 	    'width' => '5%', 	'thclass' => 'center', 			'class' => 'center',  	'nosort' => false, 'readParms'=>'link=sef&target=blank'),
 		'news_thumbnail'		=> array('title' => NWSLAN_67, 		'type' => 'method', 	'width' => '110px',	'thclass' => 'center', 			'class' => "center", 		'nosort' => false, 'readParms'=>'thumb=60&thumb_urlraw=0&thumb_aw=60','readonly'=>false),
 		'news_title'			=> array('title' => LAN_TITLE, 		'type' => 'text',       'tab'=>0, 'writeParms'=> array('required'=> 1, 'size'=>'block-level'), 'inline'=>true,		'width' => 'auto', 'thclass' => '', 				'class' => null, 		'nosort' => false),
-		'news_summary'			=> array('title' => LAN_NEWS_27, 	'type' => 'text', 	    'tab'=>0, 'writeParms'=>'size=block-level',	'width' => 'auto', 	'thclass' => 'left', 				'class' => 'left', 		'nosort' => false),
+		'news_summary'			=> array('title' => LAN_SUMMARY, 	'type' => 'text', 	    'tab'=>0, 'writeParms'=>'size=block-level',	'width' => 'auto', 	'thclass' => 'left', 				'class' => 'left', 		'nosort' => false),
 		'news_body'			    => array('title' => "", 	        'type' => 'method',     'tab'=>0,  'nolist'=>true, 'writeParms'=>'nolabel=1','data'=>'str',		'width' => 'auto', 	'thclass' => '',  'class' => null, 		'nosort' => false),
 		'news_extended'			=> array('title' => "", 	        'type' => null,     'tab'=>0,  'nolist'=>true, 'writeParms'=>'nolabel=1','data'=>'str',		'width' => 'auto', 	'thclass' => '',  'class' => null, 		'nosort' => false),

@ -1564,7 +1564,7 @@ class admin_newspost
 				'news_id'				=> array('title' => LAN_ID, 	'type' => 'number', 	'data'=> 'int', 'width' => '5%', 	'thclass' => 'center', 			'class' => 'center',  	'nosort' => false),
 				'news_thumbnail'		=> array('title' => NWSLAN_67, 	'type' => 'image', 			'data'=> 'str', 'width' => '110px',	'thclass' => 'center', 			'class' => "center", 		'nosort' => false, 'readParms'=>'thumb=60&thumb_urlraw=0&thumb_aw=60','writeParams' => 'path={e_MEDIA}','readonly'=>false),		  		
 				'news_title'			=> array('title' => LAN_TITLE, 		'type' => 'text', 		'data'=> 'str','width' => 'auto', 	'thclass' => '', 				'class' => null, 		'nosort' => false),
-				'news_summary'			=> array('title' => LAN_NEWS_27, 	'type' => 'text', 		'data'=> 'str','width' => 'auto', 	'thclass' => '', 				'class' => null, 		'nosort' => false),			
+				'news_summary'			=> array('title' => LAN_SUMMARY, 	'type' => 'text', 		'data'=> 'str','width' => 'auto', 	'thclass' => '', 				'class' => null, 		'nosort' => false),			
 				
 				'news_meta_keywords'	=> array('title' => LAN_KEYWORDS, 	'type' => 'text', 		'data'=> 'str','width' => 'auto', 	'thclass' => '', 				'class' => null, 		'nosort' => false),
 				'news_meta_description'	=> array('title' => LAN_DESCRIPTION,'type' => 'text', 		'data'=> 'str','width' => 'auto', 	'thclass' => '', 				'class' => null, 		'nosort' => false),
@ -2804,7 +2804,7 @@ class admin_newspost
 							</tr>

 							<tr>
-								<td>".LAN_NEWS_27.":</td>
+								<td>".LAN_SUMMARY.":</td>
 								<td>
 								<input type='text' name='news_summary' value=\"". $tp->post_toForm(vartrue($_POST['news_summary']))."\" class='tbox' style='width:90%' />
 									".
--- a/e107_core/templates/user_template.php
+++ b/e107_core/templates/user_template.php
@ -47,7 +47,7 @@ $USER_SHORT_TEMPLATE_START = "
 	<br />
 	{USER_FORM_START}
 	<div class='form-inline'>
-	".LAN_USER_70.": {USER_FORM_RECORDS} ".LAN_USER_57." {USER_FORM_ORDER}
+	".LAN_SHOW.": {USER_FORM_RECORDS} ".LAN_USER_57." {USER_FORM_ORDER}
 	{USER_FORM_SUBMIT}
 	</div>
 	{USER_FORM_END}
--- a/e107_languages/English/English.php
+++ b/e107_languages/English/English.php
@ -85,7 +85,7 @@ define("LAN_DATE","Date");
 define("LAN_DATE_POSTED", "Date posted");
 define("LAN_JSCONFIRM","Are you sure?");
 define("LAN_IP", "IP Address");
-define("LAN_AUTHOR",	"Author");
+define("LAN_AUTHOR","Author");
 define("LAN_CATEGORY", "Category");
 define("LAN_GUEST", "Guest");
 define("LAN_NEXT", "Next");
@ -94,6 +94,7 @@ define("LAN_LOGIN", "Login");
 define("LAN_LOGOUT", "Logout");
 define("LAN_SETTINGS", "Settings");
 define("LAN_PASSWORD", "Password");
+define("LAN_INCORRECT_PASSWORD", "Incorrect Password");
 define("LAN_TYPE", "Type");
 define("LAN_SCREENSHOT", "Screenshot");
 define("LAN_FILE", "File");
--- a/e107_languages/English/admin/lan_fileinspector.php
+++ b/e107_languages/English/admin/lan_fileinspector.php
@ -8,7 +8,7 @@

 define("FC_LAN_1", "File Inspector");
 define("FC_LAN_2", "Scan Options");
-define("FC_LAN_3", "Show");
+//define("FC_LAN_3", "Show");
 define("FC_LAN_4", "All");
 define("FC_LAN_5", "Core Files");
 define("FC_LAN_6", "Integrity Fail Only");
--- a/e107_languages/English/admin/lan_newspost.php
+++ b/e107_languages/English/admin/lan_newspost.php
@ -150,7 +150,7 @@ define("LAN_NEWS_23", "Choose an image or video for this news item");
 // define("LAN_NEWS_24", "Image + Auto-Thumbnail");
 // define("LAN_NEWS_25", "Auto-Thumbnail size");
 // define("LAN_NEWS_26", "add new upload field");
-define("LAN_NEWS_27", "Summary");
+//define("LAN_NEWS_27", "Summary");

 define("LAN_NEWS_28", "Sticky");
 define("LAN_NEWS_29", "Select if news item will be sticky");
--- a/e107_languages/English/lan_page.php
+++ b/e107_languages/English/lan_page.php
@ -16,7 +16,7 @@ define("LAN_PAGE_3", "Requested page does not exist");
 define("LAN_PAGE_4", "Rate this page");
 define("LAN_PAGE_5", "Thank you for rating this page");
 define("LAN_PAGE_6", "You do not have permission to view this page");
-define("LAN_PAGE_7", "Incorrect password");
+//define("LAN_PAGE_7", "Incorrect password");//LAN_INCORRECT_PASSWORD
 define("LAN_PAGE_8", "Password Protected Page");
 //define("LAN_PAGE_9", "Password");//LAN_PASSWORD
 define("LAN_PAGE_10", "Submit");
--- a/e107_languages/English/lan_signup.php
+++ b/e107_languages/English/lan_signup.php
@ -60,7 +60,7 @@ define("LAN_SIGNUP_23", "to login.");
 define("LAN_SIGNUP_24", "Thank you for registering at");
 define("LAN_SIGNUP_25", "Upload your avatar");
 define("LAN_SIGNUP_26", "Upload your photograph");
-define("LAN_SIGNUP_27", "Show");
+//define("LAN_SIGNUP_27", "Show"); //not found in signup.php 
 //define("LAN_SIGNUP_28", "choice of Content/Mail-lists");		Now LAN_USER_73
 //define("LAN_SIGNUP_29", "A verification email will be sent to the email address you enter here so it must be valid.");
 define("LAN_SIGNUP_30", "If you do not wish to display your email address on this site, please select 'Yes' for the 'Hide email address?' option.");
@ -84,7 +84,7 @@ define("LAN_SIGNUP_48", "Username or Email");
 define("LAN_SIGNUP_49", "If you registered with the wrong email address, as well as filling in the box above, type a new email address and your password here:");
 define("LAN_SIGNUP_50", "New Email");
 define("LAN_SIGNUP_51", "Old Password");
-define("LAN_SIGNUP_52", "Incorrect Password");
+//define("LAN_SIGNUP_52", "Incorrect Password");//LAN_INCORRECT_PASSWORD
 define("LAN_SIGNUP_53", "field failed validation test");
 define("LAN_SIGNUP_54", "Click here to fill in your details to register");
 //define("LAN_SIGNUP_55", "That display name is too long. Please choose another");
--- a/e107_languages/English/lan_user.php
+++ b/e107_languages/English/lan_user.php
@ -97,7 +97,7 @@ define("LAN_USER_66", "Visits to site since registration");		// LAN_146
 define("LAN_USER_67", "Chatbox posts");							// LAN_147
 define("LAN_USER_68", "Comments posted");						// LAN_148
 define("LAN_USER_69", "Forum posts");							// LAN_149
-define("LAN_USER_70", "Show");									// LAN_419
+//define("LAN_USER_70", "Show");									// LAN_419
 define("LAN_USER_71", "Signature: ");							// LAN_120
 define("LAN_USER_72", "Avatar: ");								// LAN_121
 define("LAN_USER_73", "choice of Content/Mail-lists");
--- a/e107_languages/English/lan_usersettings.php
+++ b/e107_languages/English/lan_usersettings.php
@ -88,7 +88,7 @@ define("LAN_USET_18", "User data changed by admin: --ID--, login name: --LOGNAME
 //define("LAN_USET_19", "Custom Title");			Now LAN_USER_74
 define("LAN_USET_20", "You must also change the user's password if you are changing their login name or email address");
 define("LAN_USET_21", "Please validate the changes by re-entering your password: ");
-define("LAN_USET_22", "Invalid password!"); // TODO LAN common?
+//define("LAN_USET_22", "Invalid password!"); // LAN_INCORRECT_PASSWORD
 define("LAN_USET_23", "Leave blank to keep existing password");		// LAN_401
 define("LAN_USET_24", "New password: ");							// LAN_152
 define("LAN_USET_25", "Re-type new password: ");					// LAN_153
--- a/page.php
+++ b/page.php
@ -986,7 +986,7 @@ class pageClass
 			}
 			else
 			{
-				e107::getMessage()->addError(LAN_PAGE_7);
+				e107::getMessage()->addError(LAN_INCORRECT_PASSWORD);
 			}
 		}
 		else
--- a/signup.php
+++ b/signup.php
@ -234,7 +234,7 @@ class signup
 			}
 			else
 			{
-				message_handler("ALERT",LAN_SIGNUP_52); // Incorrect Password.
+				message_handler("ALERT",LAN_INCORRECT_PASSWORD); // Incorrect Password.
 				return false;
 			}
 		}
--- a/user.php
+++ b/user.php
@ -35,7 +35,7 @@ $bcList = array(
 	"LAN_308"   => "LAN_USER_63", // Real Name
 	"LAN_403"   => "LAN_USER_64", // Site Stats
 	"LAN_404"   => "LAN_USER_65", // Last visit
-	"LAN_419"   => "LAN_USER_70", // Show
+	"LAN_419"   => "LAN_SHOW", // Show
 	"LAN_425"   => "LAN_USER_62" // Send Private Message
 );

--- a/usersettings.php
+++ b/usersettings.php
@ -370,7 +370,7 @@ elseif (isset($_POST['SaveValidatedInfo']))
 		if ($userMethods->CheckPassword($_POST['currentpassword'], $udata['user_loginname'], $udata['user_password']) === false) // Use old data to validate

 		{  // Invalid password
-			echo "<br />".LAN_USET_22."<br />";
+			echo "<br />".LAN_INCORRECT_PASSWORD."<br />";
 			if(!$adminEdit)
 			{
 				require_once (FOOTERF);