Skip to content
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

Fixing bug causing output of "1 Years ago" #1

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −3
Open

Fixing bug causing output of "1 Years ago" #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions TimeAgoInWords.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ public struct TimeAgoInWordsStrings {
static var Day = NSLocalizedString("d", comment:"One day in time")
static var Days = NSLocalizedString("d", comment:"More than one day in time")
static var Months = NSLocalizedString("mth", comment:"More than one month in time")
static var Year = NSLocalizedString("y", comment:"one year in time")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a big deal, but for consistency it would be nice to capitalize "one".

static var Years = NSLocalizedString("y", comment:"More than one year in time")

static public func updateStrings(dict: [String: String]) {
Expand All @@ -38,6 +39,7 @@ public struct TimeAgoInWordsStrings {
case "day": Day = value
case "days": Days = value
case "months": Months = value
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about month and months?

case "year": Year = value
case "years": Years = value
default: println("TimeAgoInWordsStrings.updateStrings key \(key) is not supported.")
}
Expand Down Expand Up @@ -95,13 +97,13 @@ public extension NSDate {
let remainder = distanceInMinutes % MINUTES_IN_YEAR
let distanceInYears = Int(floor(distanceInMinutes / MINUTES_IN_YEAR))
if remainder < MINUTES_IN_QUARTER_YEAR {
return TimeAgoInWordsStrings.About + "\(distanceInYears)" + TimeAgoInWordsStrings.Years
return TimeAgoInWordsStrings.About + "\(distanceInYears)" + (distanceInYears == 1 ? TimeAgoInWordsStrings.Year : TimeAgoInWordsStrings.Years)
}
else if remainder < MINUTES_IN_THREE_QUARTERS_YEAR {
return TimeAgoInWordsStrings.Over + "\(distanceInYears)" + TimeAgoInWordsStrings.Years
return TimeAgoInWordsStrings.Over + "\(distanceInYears)" + (distanceInYears == 1 ? TimeAgoInWordsStrings.Year : TimeAgoInWordsStrings.Years)
}
else {
return TimeAgoInWordsStrings.Almost + "\(distanceInYears + 1)" + TimeAgoInWordsStrings.Years
return TimeAgoInWordsStrings.Almost + "\(distanceInYears + 1)" + (distanceInYears == 0 ? TimeAgoInWordsStrings.Year : TimeAgoInWordsStrings.Years)
}
}
}
Expand Down