tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Fixes a translation issue where a parameter isn't replaced.

Browse Source 
Whenever File::Validate() failed due to an illegal file extension, it printed the translated message without replacing the parameter {extensions}.
This commit is contained in:
CheeseSucker 2013-06-14 00:08:44 +03:00
parent 5ff69b98ab
commit 6ce2a90f19
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
filesystem/File.php
View File

@ -875,14 +875,11 @@ class File extends DataObject {
if(!in_array(strtolower($extension), $allowed)) {
$exts = $allowed;
sort($exts);
$message = sprintf(
_t(
$message = _t(
'File.INVALIDEXTENSION',
'Extension is not allowed (valid: %s)',
'Argument 1: Comma-separated list of valid extensions'
),
wordwrap(implode(', ',$exts))
'Extension is not allowed (valid: {extensions})',
'Argument 1: Comma-separated list of valid extensions',
array('extensions' => wordwrap(implode(', ',$exts)))
);
return new ValidationResult(false, $message);
}