Commit 88258903 authored by Nigel McNie's avatar Nigel McNie
Browse files

Split MP4 files up into the audio and video versions, so that the video...

Split MP4 files up into the audio and video versions, so that the video version is allowed to be uploaded.

Also, added a language string that is shown to users if they upload something that exceeds their quota.

This is a partial fix for bug #1976. MP4 files cannot be embedded in views just yet. See the note on that bug for the reason why.
parent f38f1ebd
......@@ -126,7 +126,7 @@
</mimetypes>
</filetype>
<filetype>
<description>sgi-movie</description>
<description>sgi_movie</description>
<enabled>1</enabled>
<mimetypes>
<mimetype>video/x-sgi-movie</mimetype>
......@@ -146,6 +146,13 @@
<mimetype>video/mpeg</mimetype>
</mimetypes>
</filetype>
<filetype>
<description>mp4_video</description>
<enabled>1</enabled>
<mimetypes>
<mimetype>video/mp4</mimetype>
</mimetypes>
</filetype>
<filetype>
<description>wmv</description>
<enabled>1</enabled>
......@@ -192,7 +199,7 @@
</mimetypes>
</filetype>
<filetype>
<description>mp4</description>
<description>mp4_audio</description>
<enabled>1</enabled>
<mimetypes>
<mimetype>audio/mp4</mimetype>
......
......@@ -89,6 +89,7 @@ $string['titlefieldisrequired'] = 'The name field is required';
$string['Type'] = 'Type';
$string['unlinkthisfilefromblogposts?'] = 'This file is attached to one or more blog posts. If you delete the file, it will be removed from these posts.';
$string['upload'] = 'Upload';
$string['uploadexceedsquota'] = 'Uploading this file would exceed your disk quota. Try deleting some files you have uploaded.';
$string['uploadfile'] = 'Upload file';
$string['uploadfileexistsoverwritecancel'] = 'A file with that name already exists. You can rename the file you are about to upload, or overwrite the existing file.';
$string['uploadingfiletofolder'] = 'Uploading %s to %s';
......@@ -116,7 +117,8 @@ $string['js'] = 'Javascript File';
$string['latex'] = 'LaTeX Document';
$string['m3u'] = 'M3U Audio File';
$string['mp3'] = 'MP3 Audio File';
$string['mp4'] = 'MP4 Audio File';
$string['mp4_audio'] = 'MP4 Audio File';
$string['mp4_video'] = 'MP4 Video File';
$string['mpeg'] = 'MPEG Movie';
$string['odb'] = 'Openoffice Database';
$string['odc'] = 'Openoffice Calc File';
......
......@@ -540,7 +540,7 @@ class ArtefactTypeFile extends ArtefactTypeFileBase {
$size = $um->file['size'];
global $USER;
if (!$USER->quota_allowed($size) && !$data->adminfiles) {
return get_string('uploadexceedsquota');
return get_string('uploadexceedsquota', 'artefact.file');
}
$f = self::new_file($um->file['tmp_name'], $data);
$f->set('owner', $USER->id);
......
......@@ -27,7 +27,7 @@
defined('INTERNAL') || die();
$config = new StdClass;
$config->version = 2008031100;
$config->release = '0.4.2';
$config->version = 2008031900;
$config->release = '0.4.3';
?>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment