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

diff --git a/macosx/Controller.m b/macosx/Controller.m
index 5576cc278e7ce5664bc16bf972a19cfa29c95a98..860e0c53d40b56982e9d93a5741609fa6d066a5f 100644 (file)
--- 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 92f11ee90399f0af2dc8ec7c1ccfb0a7f8c286b5..7cfba3b1771b2819aa0dc5186ea3853747d557d9 100644 (file)
--- 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 8781e89d2125a689223010a02f6345bdc4ca5a57..1c4ec21e8901ff1bca77b31a0b29244b1e3ca8ee 100644 (file)
--- 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 918cdbd982a68aff6cd1b101fe1a5043501daef2..2f01d16ddceeaf7e162a8e61f608e86b4cd38865 100644 (file)
--- 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 0c20ea057615b823d5b88b30dfa547433f1aa602..90cb9df3dce56ea5cb2c9104b583a64454a8bc48 100644 (file)
--- 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]];
     }