diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-10-23 09:15:57 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-23 09:15:57 -0700 |
| commit | 2f8c7f0de215814add422c14675492c366729be3 (patch) | |
| tree | 25e0b2ae3c0c5038af54721882589ebce3ab90ef /apps | |
| parent | e5b619d0a673d287ccf542651b33561ec5ac5cc4 (diff) | |
| parent | 830310ad1d8b8fa52e879754cd9488530a16b47a (diff) | |
| download | nextcloud-server-2f8c7f0de215814add422c14675492c366729be3.tar.gz nextcloud-server-2f8c7f0de215814add422c14675492c366729be3.zip | |
Merge pull request #6780 from nextcloud/rakekniven-patch-1
Update file-upload.js
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/js/file-upload.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index b86b42bdb9a..bf8116a6e1a 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -971,7 +971,7 @@ OC.Uploader.prototype = _.extend({ $('#uploadprogressbar').progressbar({value: 0}); $('#uploadprogressbar .ui-progressbar-value'). html('<em class="label inner"><span class="desktop">' - + t('files', 'Uploading …') + + t('files', 'Uploading…') + '</span><span class="mobile">' + t('files', '…') + '</span></em>'); @@ -1023,7 +1023,7 @@ 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 …'); + h = t('files', 'Uploading…'); } $('#uploadprogressbar .label .mobile').text(h); $('#uploadprogressbar .label .desktop').text(h); |