Webmail: Use a relative date in messages list

This commit is contained in:
Francis Lachapelle
2014-11-25 16:35:01 -05:00
parent 41eb294946
commit 6ca0437fee
3 changed files with 18 additions and 1 deletions

View File

@@ -152,6 +152,8 @@
"No message" = "No message";
"messages" = "messages";
"Yesterday" = "Yesterday";
"first" = "First";
"previous" = "Previous";
"next" = "Next";

View File

@@ -34,6 +34,7 @@
{
NSArray *sortedUIDs; /* we always need to retrieve all anyway! */
NSArray *messages;
NSCalendarDate *now;
id message;
SOGoDateFormatter *dateFormatter;
NSTimeZone *userTimeZone;

View File

@@ -80,8 +80,10 @@
if ((self = [super initWithRequest: newRequest]))
{
user = [[self context] activeUser];
ASSIGN (now, [NSCalendarDate calendarDate]);
ASSIGN (dateFormatter, [user dateFormatterInContext: context]);
ASSIGN (userTimeZone, [[user userDefaults] timeZone]);
[now setTimeZone: userTimeZone];
sortByThread = [[user userDefaults] mailSortByThreads];
folderType = 0;
specificMessageNumber = 0;
@@ -119,7 +121,19 @@
messageDate = [[message valueForKey: @"envelope"] date];
[messageDate setTimeZone: userTimeZone];
return [dateFormatter formattedDateAndTime: messageDate];
if ([now dayOfCommonEra] == [messageDate dayOfCommonEra])
{
// Same day
return [dateFormatter formattedTime: messageDate];
}
else if ([now dayOfCommonEra] - [messageDate dayOfCommonEra] == 1)
{
return [self labelForKey: @"Yesterday"];
}
else
{
return [dateFormatter formattedDate: messageDate];
}
}
- (UIxMailSizeFormatter *) sizeFormatter