amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-09-15 02:18:00 +00:00
Code Issues Projects Releases Wiki Activity

See ChangeLog

Browse Source 
Monotone-Parent: 975e40192e290b5aa4bc5c5b99a12b299d84fa5a
Monotone-Revision: 740654a1f1be6a68843349cf438d5a87445f489e

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-07-11T18:57:27
This commit is contained in:
Ludovic Marcotte
2012-07-11 18:57:27 +00:00
parent 6556c92c87
commit 2c987bae06
6 changed files with 65 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/Appointments/SOGoAptMailReceipt.m
+5 -29
View File
@@ -31,6 +31,7 @@
#import <NGCards/iCalEvent.h>
#import <NGCards/iCalPerson.h>
#import <SOGo/NSObject+Utilities.h>
#import <SOGo/NSString+Utilities.h>
#import <SOGo/SOGoUserManager.h>
#import <SOGo/SOGoDateFormatter.h>
@@ -61,7 +62,6 @@ static NSCharacterSet *wsSet = nil;
addedAttendees = nil;
deletedAttendees = nil;
updatedAttendees = nil;
isSubject = NO;
}
return self;
@@ -76,28 +76,6 @@ static NSCharacterSet *wsSet = nil;
[super dealloc];
}
- (NSString *) getSubject
{
NSString *subject;
if (!values)
[self setupValues];
isSubject = YES;
subject = [[[self generateResponse] contentAsString]
stringByTrimmingCharactersInSet: wsSet];
if (!subject)
{
[self errorWithFormat:@"Failed to properly generate subject! Please check "
@"template for component '%@'!",
[self name]];
subject = @"ERROR: missing subject!";
}
return [subject asQPSubjectString: @"utf-8"];
}
- (NSString *) getBody
{
NSString *body;
@@ -105,8 +83,6 @@ static NSCharacterSet *wsSet = nil;
if (!values)
[self setupValues];
isSubject = NO;
body = [[self generateResponse] contentAsString];
return [body stringByTrimmingCharactersInSet: wsSet];
@@ -168,19 +144,19 @@ static NSCharacterSet *wsSet = nil;
switch (operation)
{
case EventCreated:
s = @"Receipt: event was created";
s = [self labelForKey: @"Receipt: event was created" inContext: context];
break;
case EventDeleted:
s = @"Receipt: event was deleted";
s = [self labelForKey: @"Receipt: event was deleted" inContext: context];
break;
case EventUpdated:
default:
s = @"Receipt: event was updated";
s = [self labelForKey: @"Receipt: event was updated" inContext: context];
}
return s;
return [[s stringByTrimmingCharactersInSet: wsSet] asQPSubjectString: @"utf-8"];
}
- (NSString *) _formattedUserDate: (NSCalendarDate *) date