mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-04-24 06:19:30 +00:00
Webmail: Use a relative date in messages list
This commit is contained in:
@@ -152,6 +152,8 @@
|
||||
"No message" = "No message";
|
||||
"messages" = "messages";
|
||||
|
||||
"Yesterday" = "Yesterday";
|
||||
|
||||
"first" = "First";
|
||||
"previous" = "Previous";
|
||||
"next" = "Next";
|
||||
|
||||
@@ -34,6 +34,7 @@
|
||||
{
|
||||
NSArray *sortedUIDs; /* we always need to retrieve all anyway! */
|
||||
NSArray *messages;
|
||||
NSCalendarDate *now;
|
||||
id message;
|
||||
SOGoDateFormatter *dateFormatter;
|
||||
NSTimeZone *userTimeZone;
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user