wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6780 from nextcloud/rakekniven-patch-1

Browse source 
Update file-upload.js
This commit is contained in:
Morris Jobke 2017-10-23 09:15:57 -07:00 committed by GitHub
commit 2f8c7f0de2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/files/js/file-upload.js
View file

@ -971,7 +971,7 @@ OC.Uploader.prototype = _.extend({
$('#uploadprogressbar').progressbar({value: 0}); $('#uploadprogressbar').progressbar({value: 0});
$('#uploadprogressbar .ui-progressbar-value'). $('#uploadprogressbar .ui-progressbar-value').
html('<em class="label inner"><span class="desktop">' html('<em class="label inner"><span class="desktop">'
+ t('files', 'Uploading …') + t('files', 'Uploading…')
+ '</span><span class="mobile">' + '</span><span class="mobile">'
+ t('files', '…') + t('files', '…')
+ '</span></em>'); + '</span></em>');
@ -1023,7 +1023,7 @@ OC.Uploader.prototype = _.extend({
var h = moment.duration(smoothRemainingSeconds, "seconds").humanize(); var h = moment.duration(smoothRemainingSeconds, "seconds").humanize();
if (!(smoothRemainingSeconds >= 0 && smoothRemainingSeconds < 14400)) { if (!(smoothRemainingSeconds >= 0 && smoothRemainingSeconds < 14400)) {
// show "Uploading ..." for durations longer than 4 hours // show "Uploading ..." for durations longer than 4 hours
h = t('files', 'Uploading …'); h = t('files', 'Uploading…');
} }
$('#uploadprogressbar .label .mobile').text(h); $('#uploadprogressbar .label .mobile').text(h);
$('#uploadprogressbar .label .desktop').text(h); $('#uploadprogressbar .label .desktop').text(h);