From: Mitchell Livingston <livings124@transmissionbt.com>
Date: Sun, 14 Nov 2010 20:26:58 +0000 (+0000)
Subject: add a string function to format an NSUInteger as a formatted string
X-Git-Tag: 2.13~52
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c8ada6126c621f575b1f49224e2850b6c181b252;p=transmission

add a string function to format an NSUInteger as a formatted string
---

diff --git a/macosx/Controller.m b/macosx/Controller.m
index 5576cc278..860e0c53d 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -1785,15 +1785,11 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
 
 - (void) setBottomCountText: (BOOL) filtering
 {
-    NSNumberFormatter * numberFormatter = [[[NSNumberFormatter alloc] init] autorelease];
-    [numberFormatter setNumberStyle: NSNumberFormatterDecimalStyle];
-    [numberFormatter setMaximumFractionDigits: 0];
-    
     NSString * totalTorrentsString;
     NSUInteger totalCount = [fTorrents count];
     if (totalCount != 1)
         totalTorrentsString = [NSString stringWithFormat: NSLocalizedString(@"%@ transfers", "Status bar transfer count"),
-                                [numberFormatter stringFromNumber: [NSNumber numberWithUnsignedInteger: totalCount]]];
+                                [NSString formattedUInteger: totalCount]];
     else
         totalTorrentsString = NSLocalizedString(@"1 transfer", "Status bar transfer count");
     
@@ -1804,8 +1800,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
             count -= [fDisplayedTorrents count];
         
         totalTorrentsString = [NSString stringWithFormat: NSLocalizedString(@"%@ of %@", "Status bar transfer count"),
-                                [numberFormatter stringFromNumber: [NSNumber numberWithUnsignedInteger: count]],
-                                totalTorrentsString];
+                                [NSString formattedUInteger: count], totalTorrentsString];
     }
     
     [fTotalTorrentsField setStringValue: totalTorrentsString];
diff --git a/macosx/FilterButton.m b/macosx/FilterButton.m
index 92f11ee90..7cfba3b17 100644
--- a/macosx/FilterButton.m
+++ b/macosx/FilterButton.m
@@ -23,6 +23,7 @@
  *****************************************************************************/
 
 #import "FilterButton.h"
+#import "NSStringAdditions.h"
 
 @implementation FilterButton
 
@@ -42,13 +43,9 @@
     
     fCount = count;
     
-    NSNumberFormatter * numberFormatter = [[[NSNumberFormatter alloc] init] autorelease];
-    [numberFormatter setNumberStyle: NSNumberFormatterDecimalStyle];
-    [numberFormatter setMaximumFractionDigits: 0];
-    
     [self setToolTip: fCount == 1 ? NSLocalizedString(@"1 transfer", "Filter Button -> tool tip")
         : [NSString stringWithFormat: NSLocalizedString(@"%@ transfers", "Filter Bar Button -> tool tip"),
-            [numberFormatter stringFromNumber: [NSNumber numberWithUnsignedInteger: fCount]]]];
+            [NSString formattedUInteger: fCount]]];
 }
 
 @end
diff --git a/macosx/NSStringAdditions.h b/macosx/NSStringAdditions.h
index 8781e89d2..1c4ec21e8 100644
--- a/macosx/NSStringAdditions.h
+++ b/macosx/NSStringAdditions.h
@@ -29,6 +29,8 @@
 + (NSString *) ellipsis;
 - (NSString *) stringByAppendingEllipsis;
 
++ (NSString *) formattedUInteger: (NSUInteger) value;
+
 + (NSString *) stringForFileSize: (uint64_t) size;
 
 + (NSString *) stringForSpeed: (CGFloat) speed;
diff --git a/macosx/NSStringAdditions.m b/macosx/NSStringAdditions.m
index 918cdbd98..2f01d16dd 100644
--- a/macosx/NSStringAdditions.m
+++ b/macosx/NSStringAdditions.m
@@ -46,6 +46,15 @@
 	return [self stringByAppendingString: [NSString ellipsis]];
 }
 
++ (NSString *) formattedUInteger: (NSUInteger) value
+{
+    NSNumberFormatter * numberFormatter = [[[NSNumberFormatter alloc] init] autorelease];
+    [numberFormatter setNumberStyle: NSNumberFormatterDecimalStyle];
+    [numberFormatter setMaximumFractionDigits: 0];
+    
+    return [numberFormatter stringFromNumber: [NSNumber numberWithUnsignedInteger: value]];
+}
+
 + (NSString *) stringForFileSize: (uint64_t) size
 {
     const CGFloat baseFloat = [NSApp isOnSnowLeopardOrBetter] ? 1000.0 : 1024.0;
diff --git a/macosx/PrefsController.m b/macosx/PrefsController.m
index 0c20ea057..90cb9df3d 100644
--- a/macosx/PrefsController.m
+++ b/macosx/PrefsController.m
@@ -503,11 +503,7 @@ tr_session * fHandle;
     
     if (exists)
     {
-        NSNumberFormatter * numberFormatter = [[[NSNumberFormatter alloc] init] autorelease];
-        [numberFormatter setNumberStyle: NSNumberFormatterDecimalStyle];
-        [numberFormatter setMaximumFractionDigits: 0];
-        NSString * countString = [numberFormatter stringFromNumber: [NSNumber numberWithInt: tr_blocklistGetRuleCount(fHandle)]];
-        
+        NSString * countString = [NSString formattedUInteger: tr_blocklistGetRuleCount(fHandle)];
         [fBlocklistMessageField setStringValue: [NSString stringWithFormat: NSLocalizedString(@"%@ IP address rules in list",
             "Prefs -> blocklist -> message"), countString]];
     }