Skip to content

Optimize date component calculation #4

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Optimize date component calculation #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97c281a
Create a local copy of the data components to avoid recalculating the…
ejensen Feb 27, 2022
f4e8fa8
Add the option to specify the reference date
ejensen Feb 27, 2022
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
11 changes: 6 additions & 5 deletions Sources/LocalizedTimeAgo/LocalizedTimeAgo.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@ public extension Date {

private var calendar: Calendar { return .current }

private var components: DateComponents {
private func components(relativeTo referenceDate: Date = Date()) -> DateComponents {
let unitFlags = Set<Calendar.Component>([.second,.minute,.hour,.day,.weekOfYear,.month,.year])
let now = Date()
return calendar.dateComponents(unitFlags, from: self, to: now)
return calendar.dateComponents(unitFlags, from: self, to: referenceDate)
}

func timeAgo(numericDates: Bool = false, numericTimes: Bool = false) -> String {
func timeAgo(numericDates: Bool = false, numericTimes: Bool = false, relativeTo referenceDate: Date = Date()) -> String {
let components = self.components(relativeTo: referenceDate)
if let year = components.year, year > 0 {
if year >= 2 { return String(format: "%d years ago".adjustedKey(forValue: year).localized(), year) }
return numericDates ? "1 year ago".localized() : "Last year".localized()
Expand All @@ -92,7 +92,8 @@ public extension Date {
return numericTimes ? "1 second ago".localized() : "Just now".localized()
}

func shortTimeAgo() -> String {
func shortTimeAgo(relativeTo referenceDate: Date = Date()) -> String {
let components = self.components(relativeTo: referenceDate)
if let year = components.year, year > 0 {
return String(format: "%dy".localized(), year)
} else if let month = components.month, month > 0 {
Expand Down