summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/files/js/file-upload.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 2fa3122a008..11365a310ed 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -1021,6 +1021,10 @@ OC.Uploader.prototype = _.extend({
}
var h = moment.duration(smoothRemainingSeconds, "seconds").humanize();
+ if (!(smoothRemainingSeconds >= 0 && smoothRemainingSeconds < 14400)) {
+ // show "Uploading ..." for durations longer than 4 hours
+ h = t('files', 'Uploading...');
+ }
$('#uploadprogressbar .label .mobile').text(h);
$('#uploadprogressbar .label .desktop').text(h);
$('#uploadprogressbar').attr('original-title',