From 9e8fbce45233a081c043664b17bff6966d49b3aa Mon Sep 17 00:00:00 2001 From: Bogdan Weidmann Date: Fri, 24 May 2013 14:14:17 +0200 Subject: [PATCH] Returning "just now" on future date fixed. --- NSDate+PrettyDate/NSDate+PrettyDate.m | 4 ++-- NSDate+PrettyDateTests/NSDate_PrettyDateTests.m | 7 +++++++ de.lproj/Localizable.strings | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/NSDate+PrettyDate/NSDate+PrettyDate.m b/NSDate+PrettyDate/NSDate+PrettyDate.m index 09b33f1..0810d91 100644 --- a/NSDate+PrettyDate/NSDate+PrettyDate.m +++ b/NSDate+PrettyDate/NSDate+PrettyDate.m @@ -41,7 +41,7 @@ - (NSString *)prettyDate return [NSString stringWithFormat:NSLocalizedString(@"%d minutes ago", nil), comps.minute]; } else if (comps.second < 30) { // HANDLE SECONDS - return NSLocalizedString(@"just now", nil); + return comps.second < 0 ? NSLocalizedString(@"future date", nil) : NSLocalizedString(@"just now", nil); } return [NSString stringWithFormat:NSLocalizedString(@"%d seconds ago", nil), comps.second]; } @@ -100,7 +100,7 @@ - (NSString *)prettyDate2 NSLocalizedString(@"%d minutes and %d seconds ago", nil), comps.minute, comps.second]; } else if (comps.second < 30) { // HANDLE SECONDS - return NSLocalizedString(@"a few seconds ago", nil); + return comps.second < 0 ? NSLocalizedString(@"future date", nil) : NSLocalizedString(@"a few seconds ago", nil); } return [NSString stringWithFormat:NSLocalizedString(@"%d seconds ago ...", nil), comps.second]; } diff --git a/NSDate+PrettyDateTests/NSDate_PrettyDateTests.m b/NSDate+PrettyDateTests/NSDate_PrettyDateTests.m index 81eba64..6c4d0ca 100644 --- a/NSDate+PrettyDateTests/NSDate_PrettyDateTests.m +++ b/NSDate+PrettyDateTests/NSDate_PrettyDateTests.m @@ -25,6 +25,13 @@ - (void)tearDown [super tearDown]; } +- (void)testPrettyDateFuture { + NSDate *date = [NSDate dateWithTimeIntervalSinceNow:5]; + result = [date prettyDate]; + expects = @"future date"; + STAssertTrue([result isEqualToString:expects], [NSString stringWithFormat:@"Expected '%@' got '%@'", expects, result]); +} + - (void)testPrettyDateJustNow { NSDate *date = [NSDate date]; diff --git a/de.lproj/Localizable.strings b/de.lproj/Localizable.strings index 8c91d44..66f8d63 100644 --- a/de.lproj/Localizable.strings +++ b/de.lproj/Localizable.strings @@ -8,6 +8,7 @@ // PrettyDate +"future date" = "zukünftiges Datum"; "just now" = "in diesem Moment"; "a minute ago" = "vor einer Minute"; "last hour" = "letzte Stunde";