Changeset 5118

Timestamp:

Feb 26, 2008, 12:28:22 AM (15 years ago)

Author:

livings124

Message:

format time string using unsigned values

File:

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

trunk/macosx/NSStringAdditions.m

@@ -110 +110 @@
 + (NSString *) timeString: (NSUInteger) seconds showSeconds: (BOOL) showSeconds maxDigits: (NSUInteger) max
 {
-    NSLog(@"seconds: %u max digits: %u", seconds, max);
     NSMutableArray * timeArray = [NSMutableArray arrayWithCapacity: MIN(max, 4)];
-    uint64_t remaining = seconds;
+    NSUInteger remaining = seconds;
     
     if (max > 0 && seconds >= 86400) //24 * 60 * 60
@@ -120 +119 @@
             [timeArray addObject: NSLocalizedString(@"1 day", "time string")];
         else
-            [timeArray addObject: [NSString stringWithFormat: NSLocalizedString(@"%d days", "time string"), days]];
+            [timeArray addObject: [NSString stringWithFormat: NSLocalizedString(@"%u days", "time string"), days]];
         remaining %= 86400;
         max--;
@@ -126 +125 @@
     if (max > 0 && seconds >= 3600) //60 * 60
     {
-        [timeArray addObject: [NSString stringWithFormat: NSLocalizedString(@"%d hr", "time string"), remaining / 3600]];
+        [timeArray addObject: [NSString stringWithFormat: NSLocalizedString(@"%u hr", "time string"), remaining / 3600]];
         remaining %= 3600;
         max--;
@@ -132 +131 @@
     if (max > 0 && (!showSeconds || seconds >= 60))
     {
-        [timeArray addObject: [NSString stringWithFormat: NSLocalizedString(@"%d min", "time string"), remaining / 60]];
+        [timeArray addObject: [NSString stringWithFormat: NSLocalizedString(@"%u min", "time string"), remaining / 60]];
         remaining %= 60;
         max--;
     }
     if (max > 0 && showSeconds)
-        [timeArray addObject: [NSString stringWithFormat: NSLocalizedString(@"%d sec", "time string"), remaining]];
+        [timeArray addObject: [NSString stringWithFormat: NSLocalizedString(@"%u sec", "time string"), remaining]];
     
     return [timeArray componentsJoinedByString: @" "];