The collected address book will be created only if the user select it in the preferences. Fix labels.

This commit is contained in:
Alexandre Cloutier
2014-03-27 15:27:48 -04:00
parent bce701208a
commit 1da1764aae
9 changed files with 59 additions and 47 deletions
@@ -1 +1,2 @@
"Personal Address Book" = "Carnet d'adresses personnel";
"Collected Address Book" = "Carnet d'adresses recueilli";
+1
View File
@@ -26,6 +26,7 @@
@interface SOGoContactFolders : SOGoParentFolder
- (NSString *) defaultFolderName;
- (NSString *) collectedFolderName;
- (NSException *) renameLDAPAddressBook: (NSString *) sourceID
withDisplayName: (NSString *) newDisplayName;
+6 -1
View File
@@ -268,7 +268,7 @@ Class SOGoContactSourceFolderK;
SOGoUser *currentUser;
id <SOGoSource> source;
if ([sourceID isEqualToString: @"personal"] || [sourceID isEqualToString: @"collected"])
if ([sourceID isEqualToString: @"personal"])
result = [NSException exceptionWithHTTPStatus: 403
reason: (@"folder '%@' cannot be deleted", sourceID)];
else
@@ -295,6 +295,11 @@ Class SOGoContactSourceFolderK;
return [self labelForKey: @"Personal Address Book"];
}
- (NSString *) collectedFolderName
{
return [self labelForKey: @"Collected Address Book"];
}
- (NSArray *) toManyRelationshipKeys
{
NSMutableArray *keys;