mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6940 from nextcloud/master-6935-ellipsis 

Add space between ellipsis and word
This commit is contained in:
Joas Schilling 2017-10-25 09:14:17 +02:00 committed by GitHub
parent c85deacddb 7d71b54715
commit e0c09076de
2 changed files with 3 additions and 3 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);

2
apps/files/templates/list.php
View File

@ -2,7 +2,7 @@
<div class="actions creatable hidden"> <div class="actions creatable hidden">
<div id="uploadprogresswrapper"> <div id="uploadprogresswrapper">
<div id="uploadprogressbar"> <div id="uploadprogressbar">
<em class="label outer" style="display:none"><span class="desktop"><?php p($l->t('Uploading…'));?></span><span class="mobile"><?php p($l->t('…'));?></span></em> <em class="label outer" style="display:none"><span class="desktop"><?php p($l->t('Uploading …'));?></span><span class="mobile"><?php p($l->t('…'));?></span></em>
</div> </div>
<button class="stop icon-close" style="display:none"> <button class="stop icon-close" style="display:none">
<span class="hidden-visually"><?php p($l->t('Cancel upload')) ?></span> <span class="hidden-visually"><?php p($l->t('Cancel upload')) ?></span>