propagate from branch 'ca.inverse.sogo.1_3_10' (head c4570925f011f2af2dfe09f5e9cc51de5bd1e13e)

to branch 'ca.inverse.sogo' (head 4f36a1c10a12396aed17d84ab4be1adc520d1663)

Monotone-Parent: 4f36a1c10a12396aed17d84ab4be1adc520d1663
Monotone-Parent: c4570925f011f2af2dfe09f5e9cc51de5bd1e13e
Monotone-Revision: 157b737337e2cd599c6a85f573fbd507b9e7b73e

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-11-21T14:52:42
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2011-11-21 14:52:42 +00:00
13 changed files with 349 additions and 31 deletions
@@ -27,8 +27,11 @@
"Add default email addresses" = "Add default email addresses";
"Days between responses :" = "Days between responses :";
"Do not send responses to mailing lists" = "Do not send responses to mailing lists";
"Disable auto reply on" = "Disable auto reply on";
"Please specify your message and your email addresses for which you want to enable auto reply."
= "Please specify your message and your email addresses for which you want to enable auto reply.";
"End date of your auto reply must be in the future."
= "End date of your auto reply must be in the future.";
/* forward messages */
"Forward incoming messages" = "Forward incoming messages";
+34
View File
@@ -883,6 +883,40 @@
return ignore;
}
- (BOOL) enableVacationEndDate
{
return [[vacationOptions objectForKey: @"endDateEnabled"] boolValue];
}
- (BOOL) disableVacationEndDate
{
return ![self enableVacationEndDate];
}
- (void) setEnableVacationEndDate: (BOOL) enableVacationEndDate
{
[vacationOptions setObject: [NSNumber numberWithBool: enableVacationEndDate]
forKey: @"endDateEnabled"];
}
- (void) setVacationEndDate: (NSCalendarDate *) endDate
{
NSNumber *time;
time = [NSNumber numberWithInt: [endDate timeIntervalSince1970]];
[vacationOptions setObject: time forKey: @"endDate"];
}
- (NSCalendarDate *) vacationEndDate
{
int time;
time = [[vacationOptions objectForKey: @"endDate"] intValue];
return [NSCalendarDate dateWithTimeIntervalSince1970: time];
}
/* mail forward */
- (BOOL) isForwardEnabled