Minor changes to date formatting function

stevetrease · stevetrease · commit 5e187832320b · 2015-12-17T09:55:08.000Z
diff --git a/Swift Push/Info.plist b/Swift Push/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>344</string>
+	<string>346</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIBackgroundModes</key>
diff --git a/Swift Push/PushMessages.swift b/Swift Push/PushMessages.swift
@@ -17,15 +17,16 @@ class PushMessages: NSManagedObject {
         get {
             let cal = NSCalendar(calendarIdentifier: NSCalendarIdentifierGregorian)!
             let dayReceived = cal.dateFromComponents(cal.components([.Day , .Month, .Year ], fromDate: timeReceived!))
+
             let dayToday = cal.dateFromComponents(cal.components([.Day , .Month, .Year ], fromDate: NSDate()))
             
             if (dayReceived == dayToday) {
                 return "Today"
             } else if (dayReceived == cal.dateByAddingUnit([.Day], value: -1, toDate: dayToday!, options: [])) {
                 return "Yesterday"
-            } else {
-                return NSDateFormatter.localizedStringFromDate(dayReceived!, dateStyle: .MediumStyle, timeStyle: .NoStyle) as String
             }
+            // otherwise just use date for section header
+            return NSDateFormatter.localizedStringFromDate(dayReceived!, dateStyle: .MediumStyle, timeStyle: .NoStyle) as String
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -17,15 +17,16 @@ class PushMessages: NSManagedObject {`
`17`	`17`	`get {`
`18`	`18`	`let cal = NSCalendar(calendarIdentifier: NSCalendarIdentifierGregorian)!`
`19`	`19`	`let dayReceived = cal.dateFromComponents(cal.components([.Day , .Month, .Year ], fromDate: timeReceived!))`
	`20`	`+`
`20`	`21`	`let dayToday = cal.dateFromComponents(cal.components([.Day , .Month, .Year ], fromDate: NSDate()))`
`21`	`22`
`22`	`23`	`if (dayReceived == dayToday) {`
`23`	`24`	`return "Today"`
`24`	`25`	`} else if (dayReceived == cal.dateByAddingUnit([.Day], value: -1, toDate: dayToday!, options: [])) {`
`25`	`26`	`return "Yesterday"`
`26`		`- } else {`
`27`		`- return NSDateFormatter.localizedStringFromDate(dayReceived!, dateStyle: .MediumStyle, timeStyle: .NoStyle) as String`
`28`	`27`	`}`
	`28`	`+ // otherwise just use date for section header`
	`29`	`+ return NSDateFormatter.localizedStringFromDate(dayReceived!, dateStyle: .MediumStyle, timeStyle: .NoStyle) as String`
`29`	`30`	`}`
`30`	`31`	`}`
`31`		`-}`
	`32`	`+}`