nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-24 02:49:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

using non deprecated NSCalendar and NSDate API

Browse Source
This commit is contained in:
michael starke
2016-02-24 14:20:45 +01:00
parent 627d48a74e
commit 840559630c
2 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
MacPass/NSDate+Humanized.m
View File

@@ -15,15 +15,15 @@
}
- (NSString *)humanized {
NSCalendar *calendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar];
NSDateComponents *components = [calendar components:NSMinuteCalendarUnit|NSHourCalendarUnit|NSDayCalendarUnit|NSWeekCalendarUnit|NSMonthCalendarUnit fromDate:self toDate:[NSDate date] options:0];
NSCalendar *calendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian];
NSDateComponents *components = [calendar components:NSCalendarUnitMinute|NSCalendarUnitHour|NSCalendarUnitDay|NSCalendarUnitWeekOfMonth|NSCalendarUnitMonth fromDate:self toDate:[NSDate date] options:0];
/* More than one month in the past, give full date */
if([components month] > 1) {
if(components.month > 1) {
return [NSDateFormatter localizedStringFromDate:self
dateStyle:NSDateFormatterShortStyle
timeStyle:NSDateFormatterShortStyle];
}
NSUInteger weeks = [components week];
NSUInteger weeks = components.weekOfMonth;
/* More than one week, less than a month */
if(weeks > 1) {
NSString *weekTemplate = NSLocalizedString(@"%ld_WEEKS_AGO", "% Weeks ago");
@@ -34,7 +34,7 @@
return NSLocalizedString(@"ONE_WEEK_AGO", "one week ago");
}
/* Last week */
NSUInteger days = [components day];
NSUInteger days = components.day;
if(days > 3) {
return NSLocalizedString(@"LAST_WEEK", "last week");
}
@@ -48,14 +48,13 @@
return NSLocalizedString(@"YESTERDAY", "Yesterday");
}
/* Hours ago */
if([components hour] > 1) {
if(components.hour > 1) {
NSString *hourTemplate = NSLocalizedString(@"%ld_HOURS_AGO", "% Hours ago");
return [NSString stringWithFormat:hourTemplate, [components hour]];
return [NSString stringWithFormat:hourTemplate, components.hour];
}
NSInteger minutes = [components minute];
if(minutes > 1) {
if(components.minute > 1) {
NSString *minuteTemplate = NSLocalizedString(@"%ld_MINUTES_AGO", "% Minutes ago");
return [NSString stringWithFormat:minuteTemplate, minutes];
return [NSString stringWithFormat:minuteTemplate, components.minute];
}
return NSLocalizedString(@"JUST_NOW", "Just now");
}