summaryrefslogtreecommitdiffstats
path: root/apps/files
diff options
context:
space:
mode:
authorPellaeon Lin <nfsmwlin@gmail.com>2013-12-11 15:40:58 +0800
committerPellaeon Lin <nfsmwlin@gmail.com>2013-12-11 15:40:58 +0800
commit5ddd85ff9cb64c10974804e810f8f68f275114a3 (patch)
treea32bf74e4fd63fdf0664f5e679b9978ab4e65a31 /apps/files
parent4b081be9569ed831c8f0fb7448bf798f004b8816 (diff)
downloadnextcloud-server-5ddd85ff9cb64c10974804e810f8f68f275114a3.tar.gz
nextcloud-server-5ddd85ff9cb64c10974804e810f8f68f275114a3.zip
Contextual upload error message
Diffstat (limited to 'apps/files')
-rw-r--r--apps/files/js/file-upload.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 7bd0eb81f57..1a36a580532 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -236,13 +236,13 @@ $(document).ready(function() {
// check PHP upload limit
if (selection.totalBytes > $('#upload_limit').val()) {
data.textStatus = 'sizeexceedlimit';
- data.errorThrown = t('files', 'File size exceeds upload limit');
+ data.errorThrown = t('files', 'Total file size {size1} exceeds upload limit {size2}').replace('{size1}', humanFileSize(selection.totalBytes)).replace('{size2}', humanFileSize($('#upload_limit').val()));
}
// check free space
if (selection.totalBytes > $('#free_space').val()) {
data.textStatus = 'notenoughspace';
- data.errorThrown = t('files', 'Not enough free space');
+ data.errorThrown = t('files', 'Not enough free space, you are uploading {size1} but only {size2} is left').replace('{size1}', humanFileSize(selection.totalBytes)).replace('{size2}', humanFileSize($('#free_space').val()));
}
// end upload for whole selection on error