LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

Fix localization concatenation + Cleanup unused strings #4239

Merged
infinite-persistence merged 9 commits from fix-localization-concat into master 2020-05-28 15:50:09 +02:00
Conversation 3 Commits 9 Files changed 8 +10 -5
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit e6e6c1508a - Show all commits

2
static/app-strings.json
View file

@ -581,7 +581,6 @@
"'claimId' should no longer be used. Use 'streamClaimId' or 'channelClaimId' instead": "'claimId' should no longer be used. Use 'streamClaimId' or 'channelClaimId' instead",
"View Tag": "View Tag",
"Block": "Block",
"% downloaded": "% downloaded",
"'claimName' should no longer be used. Use 'streamClaimName' or 'channelClaimName' instead": "'claimName' should no longer be used. Use 'streamClaimName' or 'channelClaimName' instead",
"Vietnamese": "Vietnamese",
"Thai": "Thai",
@ -1199,6 +1198,7 @@
"Share this channel": "Share this channel",
"File preview": "File preview",
"Go Home": "Go Home",
"%percent%% downloaded": "%percent%% downloaded",
"Uploading (%progress%%) ": "Uploading (%progress%%) ",
"Confirming": "Confirming",
"Unfollow this channel": "Unfollow this channel",

13
ui/component/fileDownloadLink/view.jsx
View file

@ -71,11 +71,16 @@ function FileDownloadLink(props: Props) {
// @if TARGET='app'
if (downloading || loading) {
const progress = fileInfo && fileInfo.written_bytes > 0 ? (fileInfo.written_bytes / fileInfo.total_bytes) * 100 : 0;
const label =
fileInfo && fileInfo.written_bytes > 0 ? progress.toFixed(0) + __('% downloaded') : __('Connecting...');
if (hideDownloadStatus) {
return null;
}
return hideDownloadStatus ? null : <span className="download-text">{label}</span>;
if (fileInfo && fileInfo.written_bytes > 0) {
const progress = (fileInfo.written_bytes / fileInfo.total_bytes) * 100;
return <span className="download-text">{__('%percent%% downloaded', { percent: progress.toFixed(0) })}</span>;
} else {
return <span className="download-text">{__('Connecting...')}</span>;
}
}
// @endif