From 3c8140604484bfd538b0852c921ccfd4e1bcb10c Mon Sep 17 00:00:00 2001
From: MikeyGMT <mikeygmt@gmail.com>
Date: Sun, 18 Dec 2016 20:05:04 +0000
Subject: [PATCH] LANS #6 Admin Shortcodes

LANS #6 Admin Shortcodes - Could not see how to use tp $lanvars as there
is a closing a tag link but no opening tag.
---
 .../shortcodes/batch/admin_shortcodes.php     | 32 +++++++++----------
 e107_languages/English/admin/lan_admin.php    |  5 ++-
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php
index 0753695b9..247ad9080 100644
--- a/e107_core/shortcodes/batch/admin_shortcodes.php
+++ b/e107_core/shortcodes/batch/admin_shortcodes.php
@@ -29,11 +29,11 @@ class admin_shortcodes
 		
 		
             if($parm=='alert')
-            {
-            	$text = 'A new update is ready to install! Click to unzip and install  v'.$cacheData.'</a>.
-            	<a class="btn btn-success" href="'.$installUrl.'">Install</a>'; 
+            {	//TODO LANVARS
+				$text = ADLAN_122.'  v'.$cacheData.'</a>.
+					<a class="btn btn-success" href="'.$installUrl.'">'.ADLAN_121.'</a>'; //Install
 				
-                 $mes->addInfo($text);
+				$mes->addInfo($text);
 				return; //  $mes->render(); 
 			}
             
@@ -41,17 +41,17 @@ class admin_shortcodes
             {
 				
 				return '<ul class="nav navbar pill navbar-nav">
-        			<li class="dropdown">
-            		<a class="dropdown-toggle" title="Messages" role="button" data-toggle="dropdown" href="#">
-                	'.E_16_E107.' <b class="caret"></b>
-            	</a> 
-            	<ul class="dropdown-menu" role="menu">
-                	<li class="nav-header dropdown-header navbar-header">Update Available</li>
-                    <li><a href="'.$installUrl.'">e107 v'.$cacheData.'</a></li>
-	          	 </ul>
-	        	</li>
-	        	</ul>
-	        ';
+						<li class="dropdown">
+						<a class="dropdown-toggle" title="'.LAN_MESSAGES.'" role="button" data-toggle="dropdown" href="#">
+						'.E_16_E107.' <b class="caret"></b>
+						</a> 
+						<ul class="dropdown-menu" role="menu">
+						<li class="nav-header dropdown-header navbar-header">'.LAN_UPDATE_AVAILABLE.'</li>
+						<li><a href="'.$installUrl.'">e107 v'.$cacheData.'</a></li>
+						</ul>
+						</li>
+						</ul>
+						';
 				
 				
 			} 
@@ -1162,7 +1162,7 @@ class admin_shortcodes
 					if($emls = $sql->count('mail_recipients', '(*)', "WHERE mail_status = 13"))
 					{
 						//$text .= "\n\t\t\t\t\t<div style='padding-bottom: 2px;'>".E_16_FAILEDLOGIN." <a href='".e_ADMIN_ABS."fla.php'>".ADLAN_146.": $flo</a></div>";
-						$oldconfigs['e-mailout'][0]	= array('icon'=>E_16_MAIL, 'title'=>"Pending Mailshots", 'url'=>e_ADMIN_ABS."mailout.php?mode=pending&action=list", 'total'=>$emls);
+						$oldconfigs['e-mailout'][0]	= array('icon'=>E_16_MAIL, 'title'=>ADLAN_167, 'url'=>e_ADMIN_ABS."mailout.php?mode=pending&action=list", 'total'=>$emls);
 					}
 					
 					
diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php
index 6a580085b..6748dc28c 100644
--- a/e107_languages/English/admin/lan_admin.php
+++ b/e107_languages/English/admin/lan_admin.php
@@ -125,7 +125,7 @@ define("ADLAN_119", "Unchecked submitted links");
 
 define("ADLAN_120", "There is a database update available, please click button to install ...");
 define("ADLAN_121", "Install");
-
+define("ADLAN_122", "A new update is ready to install! Click to unzip and install v [x]";
 
 //define("ADLAN_123", "Unchecked submitted articles");
 //define("ADLAN_124", "Unchecked submitted reviews");
@@ -185,6 +185,7 @@ define("ADLAN_163", "A newer version of an installed plugin is available:");
 define("ADLAN_164", "Successfully logged in as [x].");
 define("ADLAN_165", "Powered by e107");
 define("ADLAN_166", "Return to Website");
+define("ADLAN_167", "Pending Mailshots";
 
 // define("ADLAN_CL_1", "Settings");
 define("ADLAN_CL_2", "Users");
@@ -226,6 +227,7 @@ Below is the list of files that could potentially be malicious:");
 define("LAN_CREATE","Create");
 define("LAN_MANAGE","Manage");
 define("LAN_UPDATE","Update");
+define("LAN_UPDATE_AVAILABLE","Update Available";
 define("LAN_ADD", "Add");
 define("LAN_SAVE","Save");
 define("LAN_SAVED","Saved");
@@ -233,6 +235,7 @@ define("LAN_SETSAVED","Your settings have been saved");
 define("LAN_NOCHANGE_NOTSAVED", "Nothing changed - not saved");
 define("LAN_CONFIRMDEL","Please confirm you wish to delete");
 define("LAN_ERRORS", "Errors");
+define("LAN_MESSAGES", "Messages");
 
 define("LAN_OPTIONS","Options");
 define("LAN_PREFS","Preferences");