Merge branch 'master' into 2.5

This commit is contained in:
mark_story 2014-01-30 10:13:37 -05:00
commit c1ab6fa9d1
8 changed files with 80 additions and 3 deletions

View file

@ -528,6 +528,7 @@ class ExtractTask extends AppShell {
$msgid = $rule;
}
if ($msgid) {
$msgid = $this->_formatString(sprintf("'%s'", $msgid));
$details = array(
'file' => $file,
'line' => 'validation for field ' . $field