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

More language-file cleanup (sprintf removal)

Browse Source
This commit is contained in:
Cameron
2013-10-29 18:41:02 -07:00
parent cd8ea2f67c
commit 1b3e70f8fd
9 changed files with 84 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
e107_handlers/validator_class.php
View File

@@ -771,6 +771,12 @@ class e_validator
*/
function addValidateMessage($field_title, $err_code = 0, $err_message = '', $custom = '')
{
$lanVars = array(
'x' => $field_title,
'y' => $err_code,
'z' => $this->getErrorByCode($err_code)
);
if($custom)
{
e107::getMessage()->addStack(sprintf($err_message, $err_code, $field_title), $this->_message_stack, (true === $custom ? E_MESSAGE_ERROR : $custom));
@@ -782,26 +788,36 @@ class e_validator
$dbgmsg = false;
if($err_message)
{
$lan = (!$field_title || strpos($err_message, '%1$s') !== false ? '' : '<strong>&quot;%1$s&quot;</strong> - ').$err_message; // custom, e.g. // default '<strong>&quot;%1$s&quot;</strong> field error: Custom error message. '
$lan = (!$field_title || strpos($err_message, '[x]') !== false ? '' : '[x] - ').$err_message; // custom, e.g. // default '<strong>&quot;%1$s&quot;</strong> field error: Custom error message. '
$dbgmsg = LAN_VALIDATE_FAILMSG;
}
//Core message
/*
$msg = sprintf(
$lan, // default '<strong>&quot;%1$s&quot;</strong> validation error: [#%2$d] %3$s. '
$field_title,
$err_code,
$this->getErrorByCode($err_code)
);
*/
//NEW - removes need for using sprintf()
$msg = $tp->lanVars($lan,$lanVars,true); // '[x] validation error: [y] [z].'
if($dbgmsg && defset('e107_DEBUG_LEVEL'))
{
e107::getMessage()->addDebug($tp->lanVars($dbgmsg,$lanVars));
/*
e107::getMessage()->addDebug(sprintf(
$dbgmsg,
$field_title,
$err_code,
$this->getErrorByCode($err_code)
));
*/
}
e107::getMessage()->addStack($msg, $this->_message_stack, E_MESSAGE_ERROR);