Changeset 14341 for trunk/macosx/StatsWindowController.m

Timestamp:

Oct 17, 2014, 5:12:00 AM (8 years ago)

Author:

livings124

Message:

Yosemite: use NSDateComponentsFormatter instead of custom time string code

File:

• trunk/macosx/StatsWindowController.m (modified) (1 diff)

trunk/macosx/StatsWindowController.m

@@ -197 +197 @@
     [fRatioAllField setStringValue: totalRatioString];
     
-    [fTimeField setStringValue: [NSString timeString: statsSession.secondsActive showSeconds: NO]];
-    [fTimeAllField setStringValue: [NSString stringWithFormat: NSLocalizedString(@"%@ total", "stats total"), [NSString timeString: statsAll.secondsActive showSeconds: NO]]];
+    if ([NSApp isOnYosemiteOrBetter]) {
+        static NSDateComponentsFormatter *timeFormatter;
+        static dispatch_once_t onceToken;
+        dispatch_once(&onceToken, ^{
+            timeFormatter = [NSDateComponentsFormatter new];
+            timeFormatter.unitsStyle = NSDateComponentsFormatterUnitsStyleFull;
+            timeFormatter.maximumUnitCount = 3;
+            timeFormatter.allowedUnits = NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitWeekOfMonth | NSCalendarUnitDay | NSCalendarUnitHour | NSCalendarUnitMinute;
+            timeFormatter.zeroFormattingBehavior = NSDateComponentsFormatterZeroFormattingBehaviorDropLeading;
+        });
+        
+        [fTimeField setStringValue: [timeFormatter stringFromTimeInterval:statsSession.secondsActive]];
+        [fTimeAllField setStringValue: [NSString stringWithFormat: NSLocalizedString(@"%@ total", "stats total"), [timeFormatter stringFromTimeInterval:statsAll.secondsActive]]];
+    }
+    else {
+        [fTimeField setStringValue: [NSString timeString: statsSession.secondsActive includesTimeRemainingPhrase:NO showSeconds: NO]];
+        [fTimeAllField setStringValue: [NSString stringWithFormat: NSLocalizedString(@"%@ total", "stats total"), [NSString timeString: statsAll.secondsActive includesTimeRemainingPhrase:NO showSeconds: NO]]];
+    }
     
     if (statsAll.sessionCount == 1)