Changeset 14341 for trunk/macosx/TrackerNode.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/TrackerNode.m (modified) (2 diffs)

trunk/macosx/TrackerNode.m

@@ -24 +24 @@
 
 #import "TrackerNode.h"
+#import "NSApplicationAdditions.h"
 #import "NSStringAdditions.h"
 
@@ -157 +158 @@
         
         case TR_TRACKER_WAITING:
+        {
+            const NSTimeInterval nextAnnounceTimeLeft = fStat.nextAnnounceTime - [[NSDate date] timeIntervalSince1970];
+            
+            NSString *timeString;
+            if ([NSApp isOnYosemiteOrBetter]) {
+                static NSDateComponentsFormatter *formatter;
+                static dispatch_once_t onceToken;
+                dispatch_once(&onceToken, ^{
+                    formatter = [NSDateComponentsFormatter new];
+                    formatter.unitsStyle = NSDateComponentsFormatterUnitsStyleAbbreviated;
+                    formatter.zeroFormattingBehavior = NSDateComponentsFormatterZeroFormattingBehaviorDropLeading;
+                    formatter.collapsesLargestUnit = YES;
+                });
+                
+                timeString = [formatter stringFromTimeInterval: nextAnnounceTimeLeft];
+            }
+            else {
+                timeString = [NSString timeString: nextAnnounceTimeLeft includesTimeRemainingPhrase: NO showSeconds: YES];
+            }
             return [NSString stringWithFormat: NSLocalizedString(@"Next announce in %@", "Tracker next announce"),
-                    [NSString timeString: fStat.nextAnnounceTime - [[NSDate date] timeIntervalSince1970] showSeconds: YES]];
-        
+                    timeString];
+        }
         case TR_TRACKER_QUEUED:
             return [NSLocalizedString(@"Announce is queued", "Tracker next announce") stringByAppendingEllipsis];