From 4f11506522acc7a37c6d06e02e0c443758c252b0 Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Wed, 27 Feb 2008 19:58:15 +0000 Subject: [PATCH] streamline code from last commit --- macosx/AddWindowController.m | 12 +++++------- macosx/English.lproj/Localizable.strings | Bin 53324 -> 53596 bytes 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/macosx/AddWindowController.m b/macosx/AddWindowController.m index f8222910d..84f8e1193 100644 --- a/macosx/AddWindowController.m +++ b/macosx/AddWindowController.m @@ -207,19 +207,17 @@ - (void) updateStatusField: (NSNotification *) notification { NSString * statusString = [NSString stringForFileSize: [fTorrent size]]; - if ([fTorrent folder]) - statusString = [statusString stringByAppendingFormat: NSLocalizedString(@" (%@ selected)", "Add torrent -> info"), - [NSString stringForFileSize: [fTorrent totalSizeSelected]]]; - if ([fTorrent folder]) { NSString * fileString; int count = [fTorrent fileCount]; if (count != 1) - fileString = [NSString stringWithFormat: NSLocalizedString(@"%d Files, ", "Add torrent -> info"), count]; + fileString = [NSString stringWithFormat: NSLocalizedString(@"%d Files", "Add torrent -> info"), count]; else - fileString = NSLocalizedString(@"1 File, ", "Add torrent -> info"); - statusString = [fileString stringByAppendingString: statusString]; + fileString = NSLocalizedString(@"1 File", "Add torrent -> info"); + + statusString = [NSString stringWithFormat: NSLocalizedString(@"%@, %@ (%@ selected)", "Add torrent -> info"), fileString, + statusString, [NSString stringForFileSize: [fTorrent totalSizeSelected]]]; } [fStatusField setStringValue: statusString]; diff --git a/macosx/English.lproj/Localizable.strings b/macosx/English.lproj/Localizable.strings index 4ce009a1264eb7c16e517b368cebd96d84833079..129039f6f9bd7dfbffbbca8bd9259619a31d24b2 100644 GIT binary patch delta 211 zcmX@JfcefM<_%R`lY7+UCePziVAfzzoxGnzbn-D4p~(&0Y?JSBaj^o$7>piDU%Q8iBCQt$TrzUSYq-S2ZhP6gajrRrRx9<Lv3<_5C