Changeset 10988 for trunk/macosx/NSStringAdditions.m

Timestamp:

Jul 10, 2010, 2:31:05 AM (12 years ago)

Author:

livings124

Message:

when localizing units of speed, localize the full speed string; localize the speed & size strings passed to libtransmission

File:

• trunk/macosx/NSStringAdditions.m (modified) (3 diffs)

trunk/macosx/NSStringAdditions.m

@@ -29 +29 @@
 #import "utils.h"
 
+@interface NSString (Private)
+
++ (NSString *) stringForSpeed: (CGFloat) speed kb: (NSString *) kb mb: (NSString *) mb gb: (NSString *) gb;
+
+@end
+
 @implementation NSString (NSStringAdditions)
 
@@ -81 +87 @@
 + (NSString *) stringForSpeed: (CGFloat) speed
 {
-    return [[self stringForSpeedAbbrev: speed] stringByAppendingString: NSLocalizedString(@"B/s", "Transfer speed (Bytes per second)")];
+    return [self stringForSpeed: speed
+                kb: NSLocalizedString(@"KB/s", "Transfer speed (kilobytes per second)")
+                mb: NSLocalizedString(@"MB/s", "Transfer speed (megabytes per second)")
+                gb: NSLocalizedString(@"GB/s", "Transfer speed (gigabytes per second)")];
 }
 
 + (NSString *) stringForSpeedAbbrev: (CGFloat) speed
 {
-    if (speed <= 999.95) //0.0 K to 999.9 K
-        return [NSString localizedStringWithFormat: @"%.1f K", speed];
-    
-    speed /= 1024.0;
-    
-    if (speed <= 99.995) //0.98 M to 99.99 M
-        return [NSString localizedStringWithFormat: @"%.2f M", speed];
-    else if (speed <= 999.95) //100.0 M to 999.9 M
-        return [NSString localizedStringWithFormat: @"%.1f M", speed];
-    else //insane speeds
-        return [NSString localizedStringWithFormat: @"%.2f G", (speed / 1024.0)];
+    return [self stringForSpeed: speed kb: @"K" mb: @"M" gb: @"G"];
 }
 
@@ -187 +186 @@
 
 @end
+
+@implementation NSString (Private)
+
++ (NSString *) stringForSpeed: (CGFloat) speed kb: (NSString *) kb mb: (NSString *) mb gb: (NSString *) gb
+{
+    if (speed <= 999.95) //0.0 KB/s to 999.9 KB/s
+        return [NSString localizedStringWithFormat: @"%.1f %@", speed, kb];
+    
+    speed /= 1024.0;
+    
+    if (speed <= 99.995) //0.98 MB/s to 99.99 MB/s
+        return [NSString localizedStringWithFormat: @"%.2f %@", speed, mb];
+    else if (speed <= 999.95) //100.0 MB/s to 999.9 MB/s
+        return [NSString localizedStringWithFormat: @"%.1f %@", speed, mb];
+    else //insane speeds
+        return [NSString localizedStringWithFormat: @"%.2f %@", (speed / 1024.0), gb];
+}
+
+@end