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

Updated String formatting. Label font-weight was already normal.

Browse source
This commit is contained in:
luckydonald 2014-08-13 13:06:00 +02:00
parent 5e86ff6d85
commit 69d88500d3
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/files/css/upload.css
View file

@ -73,7 +73,7 @@
opacity: 1;
overflow: hidden;
white-space: nowrap;
font-weight: normal;
font-weight: normal;
}
#uploadprogressbar .label.inner {
color:white;

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

@ -490,39 +490,39 @@ OC.Upload = {
var timeStringMobile = "";
var timeStringDesktop = "";
if(date.getUTCHours()>0){
timeStringDesktop = t('files', '{hours}:{minutes}:{seconds} Hour{plural_s} left' , {
timeStringDesktop = t('files', '{hours}:{minutes}:{seconds} hour{plural_s} left' , {
hours:date.getUTCHours(),
minutes: ('0' + date.getUTCMinutes()).slice(-2),
seconds: ('0' + date.getUTCSeconds()).slice(-2),
plural_s: (!(date.getUTCHours()== 1 && date.getUTCMinutes()== 0 && date.getUTCSeconds()== 0) ? "s": "")
plural_s: (date.getUTCHours()== 1 && date.getUTCMinutes()== 0 && date.getUTCSeconds()== 0 ? "": "s")
});
timeStringMobile = t('files', '{hours}:{minutes}:{seconds}h' , {
timeStringMobile = t('files', '{hours}:{minutes}h' , {
hours:date.getUTCHours(),
minutes: ('0' + date.getUTCMinutes()).slice(-2),
seconds: ('0' + date.getUTCSeconds()).slice(-2)
});
} else if(date.getUTCMinutes()>0){
timeStringDesktop = t('files', '{minutes}:{seconds} Minute{plural_s} left' , {
timeStringDesktop = t('files', '{minutes}:{seconds} minute{plural_s} left' , {
minutes: date.getUTCMinutes(),
seconds: ('0' + date.getUTCSeconds()).slice(-2),
plural_s: (!(date.getUTCMinutes()== 1 && date.getUTCSeconds()== 0)? "s": "")
plural_s: (date.getUTCMinutes()== 1 && date.getUTCSeconds()== 0 ? "": "s")
});
timeStringMobile = t('files', '{minutes}:{seconds}min' , {
timeStringMobile = t('files', '{minutes}:{seconds}m' , {
minutes: date.getUTCMinutes(),
seconds: ('0' + date.getUTCSeconds()).slice(-2)
});
} else if(date.getUTCSeconds()>0){
timeStringDesktop = t('files', '{seconds} Second{plural_s} left' , {
timeStringDesktop = t('files', '{seconds} second{plural_s} left' , {
seconds: date.getUTCSeconds(),
plural_s: (!date.getUTCSeconds()== 1 ? "s": "")
plural_s: (date.getUTCSeconds() == 1 ? "": "s")
});
timeStringMobile = t('files', '{seconds}s' , {seconds: date.getUTCSeconds()});
} else {
timeStringDesktop = t('files', 'Any moment now...');
timeStringMobile = t('files', 'Soon...');
}
$('#uploadprogressbar .label .mobile').text(timeStringMobile);//t('files', '{loadedSize}', {loadedSize: humanFileSize(data.loaded)}));
$('#uploadprogressbar .label .desktop').text(timeStringDesktop);//
$('#uploadprogressbar .label .mobile').text(timeStringMobile);
$('#uploadprogressbar .label .desktop').text(timeStringDesktop);
$('#uploadprogressbar').attr('title', t('files', '{loadedSize} of {totalSize} ({bitrate})', {loadedSize: humanFileSize(data.loaded), totalSize: humanFileSize(data.total), bitrate: humanFileSize(data.bitrate) + '/s'}));
$('#uploadprogressbar').progressbar('value', progress);
});