";
diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php
index 5aace55e9..76924100a 100644
--- a/e107_handlers/e_parse_class.php
+++ b/e107_handlers/e_parse_class.php
@@ -2811,6 +2811,7 @@ class e_parser
* @param $lan - string LAN
* @param string | array $vals - either a single value, which will replace '[x]' or an array with key=>value pairs.
* @example $tp->lanVars("My name is [x] and I own a [y]", array('x'=>"John", 'y'=>"Cat"));
+ * @example $tp->lanVars("My name is [x] and I own a [y]", array("John","Cat"));
* @return string
*/
function lanVars($lan, $vals, $bold=false)
@@ -2821,8 +2822,15 @@ class e_parser
$search = array();
$replace = array();
+ $defaults = array('x', 'y', 'z');
+
foreach($array as $k=>$v)
{
+ if(is_numeric($k)) // convert array of numeric to x,y,z
+ {
+ $k = $defaults[$k];
+ }
+
$search[] = "[".$k."]";
$replace[] = ($bold===true) ? "".$v."" : $v;
}
diff --git a/e107_languages/English/lan_contact.php b/e107_languages/English/lan_contact.php
index ba2be6e2d..1755bc012 100644
--- a/e107_languages/English/lan_contact.php
+++ b/e107_languages/English/lan_contact.php
@@ -31,4 +31,4 @@ define("LANCONTACT_13", "Please include a subject.");
define("LANCONTACT_14", "Send message to:");
define("LANCONTACT_15", "Incorrect code entered");
-define("LANCONTACT_16", "Enter Code");
+
diff --git a/e107_languages/English/lan_signup.php b/e107_languages/English/lan_signup.php
index 2f10d475f..52602da6b 100644
--- a/e107_languages/English/lan_signup.php
+++ b/e107_languages/English/lan_signup.php
@@ -23,9 +23,9 @@ define("PAGE_NAME", "Register");
//define("LAN_106", "That doesn't appear to be a valid email address");
define("LAN_108", "Registration complete");
define("LAN_185", "You left required field(s) blank");
-define("LAN_201", "Yes");
-define("LAN_200", "No");
-define("LAN_399", "Continue");
+// define("LAN_201", "Yes");
+// define("LAN_200", "No");
+// define("LAN_399", "Continue");
define("LAN_407", "Please keep this email for your own information. Your password has been encrypted and cannot be retrieved if you misplace or forget it. You can however request a new password if this happens.\n\nThanks for your registration.\n\nFrom");
//define("LAN_408", "A user with that email address already exists. Please use the 'forgot password' screen to retrieve your password.");
diff --git a/e107_plugins/pm/languages/English.php b/e107_plugins/pm/languages/English.php
index 5dcaf2340..a19a7316e 100755
--- a/e107_plugins/pm/languages/English.php
+++ b/e107_plugins/pm/languages/English.php
@@ -71,12 +71,8 @@ define('LAN_PM_67', 'No users blocked');
define('LAN_PM_68', 'User Name');
define('LAN_PM_69', 'Date blocked');
define('LAN_PM_70', 'Deleting block on user');
-define('LAN_PM_71', '--GOOD-- attachment(s) deleted. --FAIL-- failure(s)');
-define('LAN_PM_72', '');
-define('LAN_PM_73', '');
-define('LAN_PM_74', '');
-define('LAN_PM_75', '');
-define('LAN_PM_76', '');
+define('LAN_PM_71', '[x] attachment(s) deleted. [y] failure(s)');
+
define("LAN_PM_100", "New PM from ");
define("LAN_PM_101", "You have received a new Private Message from ");
@@ -88,6 +84,5 @@ define("LAN_PM_106", "PM read by ");
define("LAN_PM_107", "The Private Message you sent to {UNAME} was read on ");
define("LAN_PM_108", "Message sent on: ");
define("LAN_PM_109", "New Message(s)");
-define("LAN_PM_110", "ok");
define("LAN_PM_111", "Read");
?>
\ No newline at end of file
diff --git a/e107_plugins/pm/pm_class.php b/e107_plugins/pm/pm_class.php
index 0eb5c788b..8d2c0dc8c 100755
--- a/e107_plugins/pm/pm_class.php
+++ b/e107_plugins/pm/pm_class.php
@@ -316,7 +316,9 @@ class private_message
}
if ($aCount[0] || $aCount[1])
{
- $ret .= str_replace(array('--GOOD--', '--FAIL--'), $aCount, LAN_PM_71).' ';
+
+ // $ret .= str_replace(array('--GOOD--', '--FAIL--'), $aCount, LAN_PM_71).' ';
+ $ret .= e107::getParser()->lanVars(LAN_PM_71, $aCount);
}
$sql->delete('private_msg', 'pm_id = '.$pmid);
}
diff --git a/e107_plugins/pm/private_msg_menu.php b/e107_plugins/pm/private_msg_menu.php
index b59655d15..3dacde3ac 100755
--- a/e107_plugins/pm/private_msg_menu.php
+++ b/e107_plugins/pm/private_msg_menu.php
@@ -54,7 +54,7 @@ if(!function_exists('pm_show_popup'))