Fix until date in event recurrence editor

- fixed date picker
- fixed JavaScript error caused by French translation
- fixed until date definition when timezone of active user was different
  from the system timezone
- fixes #2173, fixes #2175
This commit is contained in:
Francis Lachapelle
2013-01-11 09:46:58 -05:00
parent c7fbcb0fc4
commit 0e0b7728fd
5 changed files with 23 additions and 12 deletions
+10
View File
@@ -1917,10 +1917,20 @@ RANGE(2);
else if (range == 2)
{
NSCalendarDate *date;
SOGoUserDefaults *ud;
date = [NSCalendarDate dateWithString: [self range2]
calendarFormat: dateFormat
locale: locale];
// Adjust timezone
ud = [[context activeUser] userDefaults];
date = [NSCalendarDate dateWithYear: [date yearOfCommonEra]
month: [date monthOfYear]
day: [date dayOfYear]
hour: 0 minute: 0 second: 0
timeZone: [ud timeZone]];
[theRule setUntilDate: date];
}
// No end date.