mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

even more string folding!

This commit is contained in:
Mitchell Livingston 2008-04-07 13:43:26 +00:00
parent ab2d8a4507
commit c0e2f95ffd
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
macosx/English.lproj/Localizable.strings
View File

Binary file not shown.

25
macosx/Torrent.m
View File

@ -974,15 +974,13 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
if (![self allDownloaded])
{
if ([self folder] && [fDefaults boolForKey: @"DisplayStatusProgressSelected"])
{
string = [NSString localizedStringWithFormat: NSLocalizedString(@"%@ of %@ selected (%.2f%%)",
"Torrent -> progress string"), [NSString stringForFileSize: [self haveTotal]],
[NSString stringForFileSize: [self totalSizeSelected]], 100.0 * [self progressDone]];
}
string = [NSString stringWithFormat: NSLocalizedString(@"%@ of %@ selected", "Torrent -> progress string"),
[NSString stringForFileSize: [self haveTotal]], [NSString stringForFileSize: [self totalSizeSelected]]];
else
string = [NSString localizedStringWithFormat: NSLocalizedString(@"%@ of %@ (%.2f%%)", "Torrent -> progress string"),
[NSString stringForFileSize: [self haveTotal]],
[NSString stringForFileSize: [self size]], 100.0 * [self progress]];
string = [NSString stringWithFormat: NSLocalizedString(@"%@ of %@", "Torrent -> progress string"),
[NSString stringForFileSize: [self haveTotal]], [NSString stringForFileSize: [self size]]];
string = [NSString localizedStringWithFormat: @"%@ (%.2f%%)", string, 100.0 * [self progress]];
}
else
{
@ -991,11 +989,14 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
{
if ([fDefaults boolForKey: @"DisplayStatusProgressSelected"])
downloadString = [NSString stringWithFormat: NSLocalizedString(@"%@ selected", "Torrent -> progress string"),
[NSString stringForFileSize: [self haveTotal]]];
[NSString stringForFileSize: [self haveTotal]]];
else
downloadString = [NSString localizedStringWithFormat: NSLocalizedString(@"%@ of %@ (%.2f%%)",
"Torrent -> progress string"), [NSString stringForFileSize: [self haveTotal]],
[NSString stringForFileSize: [self size]], 100.0 * [self progress]];
{
downloadString = [NSString stringWithFormat: NSLocalizedString(@"%@ of %@", "Torrent -> progress string"),
[NSString stringForFileSize: [self haveTotal]], [NSString stringForFileSize: [self size]]];
downloadString = [NSString localizedStringWithFormat: @"%@ (%.2f%%)", downloadString, 100.0 * [self progress]];
}
}
else
downloadString = [NSString stringForFileSize: [self size]];