Index: branches/RC/core/kernel/utility/formatters/upload_formatter.php =================================================================== diff -u -r8929 -r9047 --- branches/RC/core/kernel/utility/formatters/upload_formatter.php (.../upload_formatter.php) (revision 8929) +++ branches/RC/core/kernel/utility/formatters/upload_formatter.php (.../upload_formatter.php) (revision 9047) @@ -89,19 +89,19 @@ $max_filesize = isset($options['max_size']) ? $options['max_size'] : MAX_UPLOAD_SIZE; if (getArrayValue($options, 'allowed_types') && !in_array($value['type'], $options['allowed_types'])) { - $object->SetError($field_name, 'bad_file_format'); + $object->SetError($field_name, 'bad_file_format', 'la_error_InvalidFileFormat'); } elseif ($value['size'] > $max_filesize) { - $object->SetError($field_name, 'bad_file_size'); + $object->SetError($field_name, 'bad_file_size', 'la_error_FileTooLarge'); } elseif (!is_writable($this->FullPath)) { - $object->SetError($field_name, 'cant_save_file'); + $object->SetError($field_name, 'cant_save_file', 'la_error_cant_save_file'); } else { $real_name = $this->ValidateFileName($this->FullPath, $value['name']); $file_name = $this->FullPath.$real_name; if (!move_uploaded_file($value['tmp_name'], $file_name)) { - $object->SetError($field_name, 'cant_save_file'); + $object->SetError($field_name, 'cant_save_file', 'la_error_cant_save_file'); } else { @chmod($file_name, 0666); @@ -125,7 +125,7 @@ } } else { - $object->SetError($field_name, 'cant_save_file'); + $object->SetError($field_name, 'cant_save_file', 'la_error_cant_save_file'); } } else { @@ -136,7 +136,7 @@ // && !$object->FieldErrors[$field_name]['pseudo'] - already implemented in kDBItem::SetError method if ((count($value) > 1) && $value['error'] && ($value['error'] != UPLOAD_ERR_NO_FILE)) { - $object->SetError($field_name, 'cant_save_file'); + $object->SetError($field_name, 'cant_save_file', 'la_error_cant_save_file'); } return $ret;