Skip to content

Patch time ago #257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
UberJason wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Patch time ago #257

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12c9772
Bug fix for timeAgo where a date that should be "yesterday" is instea…
UberJason Apr 6, 2018
145c343
Patch for a situation where the two dates are less than 2 days apart,…
UberJason Apr 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 16 additions & 11 deletions DateToolsSwift/DateTools/Date+TimeAgo.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ public extension Date {


let components = calendar.dateComponents(unitFlags, from: earliest, to: latest)
let yesterday = date.subtract(1.days)
let isYesterday = yesterday.day == self.day
let yesterday = latest.subtract(1.days)
let isYesterday = yesterday.day == earliest.day

//Not Yet Implemented/Optional
//The following strings are present in the translation files but lack logic as of 2014.04.05
Expand Down Expand Up @@ -112,12 +112,17 @@ public extension Date {
else if (components.day! >= 2) {
return self.logicalLocalizedStringFromFormat(format: "%%d %@days ago", value: components.day!)
}
else if (isYesterday) {
if (numericDates) {
return DateToolsLocalizedStrings("1 day ago");
else if (components.day! >= 1) {
if (isYesterday) {
if (numericDates) {
return DateToolsLocalizedStrings("1 day ago");
}

return DateToolsLocalizedStrings("Yesterday");
}
else {
return DateToolsLocalizedStrings("1 day ago")
}

return DateToolsLocalizedStrings("Yesterday");
}
else if (components.hour! >= 2) {
return self.logicalLocalizedStringFromFormat(format: "%%d %@hours ago", value: components.hour!)
Expand Down Expand Up @@ -200,9 +205,9 @@ public extension Date {

private func logicalLocalizedStringFromFormat(format: String, value: Int) -> String{
#if os(Linux)
let localeFormat = String.init(format: format, getLocaleFormatUnderscoresWithValue(Double(value)) as! CVarArg) // this may not work, unclear!!
let localeFormat = String.init(format: format, getLocaleFormatUnderscoresWithValue(Double(value)) as! CVarArg) // this may not work, unclear!!
#else
let localeFormat = String.init(format: format, getLocaleFormatUnderscoresWithValue(Double(value)))
let localeFormat = String.init(format: format, getLocaleFormatUnderscoresWithValue(Double(value)))
#endif

return String.init(format: DateToolsLocalizedStrings(localeFormat), value)
Expand Down Expand Up @@ -241,9 +246,9 @@ public extension Date {
#if os(Linux)
// NSLocalizedString() is not available yet, see: https://github.com/apple/swift-corelibs-foundation/blob/16f83ddcd311b768e30a93637af161676b0a5f2f/Foundation/NSData.swift
// However, a seemingly-equivalent method from NSBundle is: https://github.com/apple/swift-corelibs-foundation/blob/master/Foundation/NSBundle.swift
return Bundle.main.localizedString(forKey: string, value: "", table: "DateTools")
return Bundle.main.localizedString(forKey: string, value: "", table: "DateTools")
#else
return NSLocalizedString(string, tableName: "DateTools", bundle: Bundle.dateToolsBundle(), value: "", comment: "")
return NSLocalizedString(string, tableName: "DateTools", bundle: Bundle.dateToolsBundle(), value: "", comment: "")
#endif
}

Expand Down