Index: branches/5.2.x/core/kernel/utility/validator.php =================================================================== diff -u -N -r16235 -r16569 --- branches/5.2.x/core/kernel/utility/validator.php (.../validator.php) (revision 16235) +++ branches/5.2.x/core/kernel/utility/validator.php (.../validator.php) (revision 16569) @@ -1,6 +1,6 @@ Application->isAdmin ? 'la_fld_' . $field : 'lu_fld_' . $field; - $params['field'] = $this->Application->Phrase($field_phrase); - - foreach ( $params as $param_name => $param_value ) { - $msg = str_replace('{' . $param_name . '}', $param_value, $msg, $replacement_count); + if ( $params && preg_match('/%[^\s]/', $msg) ) { + $msg = vsprintf($msg, array_values($params)); } + else { + $field_phrase = $this->Application->isAdmin ? 'la_fld_' . $field : 'lu_fld_' . $field; + $params['field'] = $this->Application->Phrase($field_phrase); - if ( strpos($msg, '%s') !== false ) { - trigger_error('Unexpected "%s" in field "' . $field . '" validation error message (pseudo: "' . $error_pseudo . '") in "' . $this->dataSource->Prefix . '" unit', E_USER_WARNING); + foreach ( $params as $param_name => $param_value ) { + $msg = str_replace('{' . $param_name . '}', $param_value, $msg); + } } return $msg; Index: branches/5.2.x/core/kernel/utility/formatters/date_formatter.php =================================================================== diff -u -N -r16367 -r16569 --- branches/5.2.x/core/kernel/utility/formatters/date_formatter.php (.../date_formatter.php) (revision 16367) +++ branches/5.2.x/core/kernel/utility/formatters/date_formatter.php (.../date_formatter.php) (revision 16569) @@ -1,6 +1,6 @@ HumanFormat($format), adodb_date($format), 'value' => $value ); + $error_params = array( + 'format' => $this->HumanFormat($format), + 'sample' => adodb_date($format), + 'value' => $value, + ); $hour = 0; $minute = 0; Index: branches/5.2.x/core/install/upgrades.sql =================================================================== diff -u -N -r16560 -r16569 --- branches/5.2.x/core/install/upgrades.sql (.../upgrades.sql) (revision 16560) +++ branches/5.2.x/core/install/upgrades.sql (.../upgrades.sql) (revision 16569) @@ -2942,3 +2942,7 @@ WHERE `Name` IN ('Core', 'In-Portal'); DELETE FROM CachedUrls; + +UPDATE LanguageLabels +SET l1_Translation = 'Incorrect date format, please use ({format}) ex. ({sample})' +WHERE PhraseKey = 'LA_ERR_BAD_DATE_FORMAT'; Index: branches/5.2.x/core/install/english.lang =================================================================== diff -u -N -r16409 -r16569 --- branches/5.2.x/core/install/english.lang (.../english.lang) (revision 16409) +++ branches/5.2.x/core/install/english.lang (.../english.lang) (revision 16569) @@ -294,7 +294,7 @@ VXNlciBCYW5uZWQ= dXNlciBub3QgZm91bmQ= WW91IG11c3Qgc2VsZWN0IG9ubHkgb25lIHVzZXI= - SW5jb3JyZWN0IGRhdGUgZm9ybWF0LCBwbGVhc2UgdXNlICglcykgZXguICglcyk= + SW5jb3JyZWN0IGRhdGUgZm9ybWF0LCBwbGVhc2UgdXNlICh7Zm9ybWF0fSkgZXguICh7c2FtcGxlfSk= SW5jb3JyZWN0IGRhdGEgZm9ybWF0LCBwbGVhc2UgdXNlIHt0eXBlfQ== SW52YWxpZCBGb3JtYXQ= RmllbGQgdmFsdWUgbGVuZ3RoIGlzIG91dCBvZiByYW5nZSwgcG9zc2libGUgdmFsdWUgbGVuZ3RoIGZyb20ge21pbl9sZW5ndGh9IHRvIHttYXhfbGVuZ3RofQ==