amorfo77/sogo
1
0 Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-10-11 14:57:12 +00:00
Code Issues Projects Releases Wiki Activity

fix(mail): fix end date of all-day event in mail notifications

Browse Source 
Fixes #4145
This commit is contained in:
Francis Lachapelle committed 2021-07-09 11:52:16 -04:00
1 parent f8f4de6020
commit 694ffa74ba
5 files changed
+56 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

UI/MailPartViewers/UIxMailPartICalViewer.m
+6 -4
View File
@@ -143,7 +143,8 @@
date = [[self inEvent] startDate];
ud = [[context activeUser] userDefaults];
[date setTimeZone: [ud timeZone]];
if (![[self inEvent] isAllDay])
[date setTimeZone: [ud timeZone]];
return date;
}
@@ -186,12 +187,12 @@
if ([self isEndDateOnSameDay] &&
![[self inEvent] isAllDay])
{
[s appendFormat: @" %@", [self labelForKey: @"to"]];
[s appendFormat: @" %@", [self labelForKey: @"to_time"]];
[s appendFormat: @" %@", [self endTime]];
}
else if (![self isEndDateOnSameDay])
{
[s appendFormat: @" %@", [self labelForKey: @"to"]];
[s appendFormat: @" %@", [self labelForKey: @"to_date"]];
[s appendFormat: @" %@", [self endDate]];
if (![[self inEvent] isAllDay])
@@ -218,7 +219,8 @@
date = [[self inEvent] endDate];
ud = [[context activeUser] userDefaults];
[date setTimeZone: [ud timeZone]];
if (![[self inEvent] isAllDay])
[date setTimeZone: [ud timeZone]];
return date;
}