stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-07-25 17:24:10 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git@github.com:gallery/gallery3

Browse Source
This commit is contained in:
Bharat Mediratta
2009-06-04 18:41:41 -07:00
parent 12ef4272ae a156f1e9be
commit 2d7d55014a
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gallery/views/simple_uploader.html.php
+6 -2
View File
@@ -80,7 +80,7 @@
"user_agent": "<?= Input::instance()->server("HTTP_USER_AGENT") ?>",
"csrf": "<?= $csrf ?>"
},
file_size_limit : "<?= ini_get("upload_max_filesize") ? num::convert_to_bytes(ini_get("upload_max_filesize")) : "100M" ?>",
file_size_limit : "<?= ini_get("upload_max_filesize") ? num::convert_to_bytes(ini_get("upload_max_filesize"))."B" : "100MB" ?>",
file_types : "*.gif;*.jpg;*.jpeg;*.png;*.flv;*.mp4;*.GIF;*.JPG;*.JPEG;*.PNG;*.FLV;*.MP4",
file_types_description : "<?= t("Photos and Movies") ?>",
file_upload_limit : 1000,
@@ -149,16 +149,20 @@
var fp = new File_Progress(file);
switch (error_code) {
case SWFUpload.QUEUE_ERROR.FILE_EXCEEDS_SIZE_LIMIT:
fp.set_status("error", "<?= t("File is too big.") ?>");
fp.title.html(file.name);
fp.set_status("error", "<strong><?= t("File is too big.") ?></strong> <?= t("A likely error source is a too low value for") ?> <br /> <em>upload_max_filesize</em> (<?= ini_get('upload_max_filesize') ?>) <?= t("in your") ?> <em>php.ini</em>.");
break;
case SWFUpload.QUEUE_ERROR.ZERO_BYTE_FILE:
fp.title.html(file.name);
fp.set_status("error", "<?= t("Cannot upload empty files.") ?>");
break;
case SWFUpload.QUEUE_ERROR.INVALID_FILETYPE:
fp.title.html(file.name);
fp.set_status("error", "<?= t("Invalid file type.") ?>");
break;
default:
if (file !== null) {
fp.title.html(file.name);
fp.set_status("error", "<?= t("Unknown error") ?>");
}
break;