Change ACL modification text to non-gender specific terms
parent
db911f323d
commit
0e56527e05
|
@ -443,7 +443,7 @@
|
||||||
us = [user userSettings];
|
us = [user userSettings];
|
||||||
moduleSettings = [us objectForKey:@"Calendar"];
|
moduleSettings = [us objectForKey:@"Calendar"];
|
||||||
|
|
||||||
// Check if the user prevented his account from beeing invited to events
|
// Check if the user prevented their account from beeing invited to events
|
||||||
if (![user isResource] && [[moduleSettings objectForKey:@"PreventInvitations"] boolValue])
|
if (![user isResource] && [[moduleSettings objectForKey:@"PreventInvitations"] boolValue])
|
||||||
{
|
{
|
||||||
// Check if the user have a whiteList
|
// Check if the user have a whiteList
|
||||||
|
@ -1093,7 +1093,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// We must REMOVE any SENT-BY here. This is important since if A accepted
|
// We must REMOVE any SENT-BY here. This is important since if A accepted
|
||||||
// the event for B and then, B changes by himself his participation status,
|
// the event for B and then, B changes by theirself their participation status,
|
||||||
// we don't want to keep the previous SENT-BY attribute there.
|
// we don't want to keep the previous SENT-BY attribute there.
|
||||||
[(NSMutableDictionary *)[otherAttendee attributes] removeObjectForKey: @"SENT-BY"];
|
[(NSMutableDictionary *)[otherAttendee attributes] removeObjectForKey: @"SENT-BY"];
|
||||||
}
|
}
|
||||||
|
@ -1191,7 +1191,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// We must REMOVE any SENT-BY here. This is important since if A accepted
|
// We must REMOVE any SENT-BY here. This is important since if A accepted
|
||||||
// the event for B and then, B changes by himself his participation status,
|
// the event for B and then, B changes by theirself their participation status,
|
||||||
// we don't want to keep the previous SENT-BY attribute there.
|
// we don't want to keep the previous SENT-BY attribute there.
|
||||||
[(NSMutableDictionary *)[attendee attributes] removeObjectForKey: @"SENT-BY"];
|
[(NSMutableDictionary *)[attendee attributes] removeObjectForKey: @"SENT-BY"];
|
||||||
}
|
}
|
||||||
|
@ -1208,7 +1208,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
|
||||||
|
|
||||||
delegatedUID = [otherDelegate uid];
|
delegatedUID = [otherDelegate uid];
|
||||||
if (delegatedUID)
|
if (delegatedUID)
|
||||||
// Delegate attendee is a local user; remove event from his calendar
|
// Delegate attendee is a local user; remove event from their calendar
|
||||||
[self _removeEventFromUID: delegatedUID
|
[self _removeEventFromUID: delegatedUID
|
||||||
owner: [theOwnerUser login]
|
owner: [theOwnerUser login]
|
||||||
withRecurrenceId: [event recurrenceId]];
|
withRecurrenceId: [event recurrenceId]];
|
||||||
|
@ -1240,7 +1240,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
|
||||||
[event addToAttendees: delegate];
|
[event addToAttendees: delegate];
|
||||||
|
|
||||||
if (delegatedUID)
|
if (delegatedUID)
|
||||||
// Delegate attendee is a local user; add event to his calendar
|
// Delegate attendee is a local user; add event to their calendar
|
||||||
[self _addOrUpdateEvent: event
|
[self _addOrUpdateEvent: event
|
||||||
forUID: delegatedUID
|
forUID: delegatedUID
|
||||||
owner: [theOwnerUser login]];
|
owner: [theOwnerUser login]];
|
||||||
|
|
|
@ -644,8 +644,8 @@
|
||||||
// As much as we can, we try to use c_name == c_uid in order
|
// As much as we can, we try to use c_name == c_uid in order
|
||||||
// to avoid tricky scenarios with some CalDAV clients. For example,
|
// to avoid tricky scenarios with some CalDAV clients. For example,
|
||||||
// if Alice invites Bob (both use SOGo) and Bob accepts the invitation
|
// if Alice invites Bob (both use SOGo) and Bob accepts the invitation
|
||||||
// using Lightning before having refreshed his calendar, he'll end up
|
// using Lightning before having refreshed their calendar, they'll end up
|
||||||
// with a duplicate of the event in his database tables.
|
// with a duplicate of the event in their database tables.
|
||||||
if (isNew)
|
if (isNew)
|
||||||
{
|
{
|
||||||
newUid = nameInContainer;
|
newUid = nameInContainer;
|
||||||
|
|
|
@ -302,7 +302,7 @@ static NSArray *childRecordFields = nil;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* This method fetches the display name defined by the owner, but is also the
|
/* This method fetches the display name defined by the owner, but is also the
|
||||||
fallback when a subscriber has not redefined the display name yet in his
|
fallback when a subscriber has not redefined the display name yet in their
|
||||||
environment. */
|
environment. */
|
||||||
- (NSString *) _displayNameFromOwner
|
- (NSString *) _displayNameFromOwner
|
||||||
{
|
{
|
||||||
|
@ -895,7 +895,7 @@ static NSArray *childRecordFields = nil;
|
||||||
allUsers = [NSMutableArray arrayWithArray: [aGroup members]];
|
allUsers = [NSMutableArray arrayWithArray: [aGroup members]];
|
||||||
|
|
||||||
// We remove the active user from the group (if present) in order to
|
// We remove the active user from the group (if present) in order to
|
||||||
// not subscribe him to his own resource!
|
// not subscribe him to their own resource!
|
||||||
[allUsers removeObject: [context activeUser]];
|
[allUsers removeObject: [context activeUser]];
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
Child objects:
|
Child objects:
|
||||||
'Calendar': SOGoAppointmentFolder
|
'Calendar': SOGoAppointmentFolder
|
||||||
|
|
||||||
The SOGoUserFolder is the "home directory" of the user where all his
|
The SOGoUserFolder is the "home directory" of the user where all their
|
||||||
processing starts. It is the 'znek' in such a path:
|
processing starts. It is the 'znek' in such a path:
|
||||||
/SOGo/so/znek/Calendar
|
/SOGo/so/znek/Calendar
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -361,7 +361,7 @@
|
||||||
|
|
||||||
if (login)
|
if (login)
|
||||||
{
|
{
|
||||||
/* We redirect the user to his "homepage" when newLocation could not be
|
/* We redirect the user to their "homepage" when newLocation could not be
|
||||||
deduced from the "cas-location" cookie and the current action is not a
|
deduced from the "cas-location" cookie and the current action is not a
|
||||||
login callback (ticket != nil). */
|
login callback (ticket != nil). */
|
||||||
if (!newLocation || !ticket)
|
if (!newLocation || !ticket)
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
</var:if>
|
</var:if>
|
||||||
|
|
||||||
<var:if condition="isBody">
|
<var:if condition="isBody">
|
||||||
<var:string value="currentUserName" const:escapeHTML="NO"/> has modified your access rights for his <var:string const:value='"' const:escapeHTML="NO"/><var:string value="resourceName" const:escapeHTML="NO"/><var:string const:value='"' const:escapeHTML="NO"/> folder.
|
<var:string value="currentUserName" const:escapeHTML="NO"/> has modified your access rights for their <var:string const:value='"' const:escapeHTML="NO"/><var:string value="resourceName" const:escapeHTML="NO"/><var:string const:value='"' const:escapeHTML="NO"/> folder.
|
||||||
<!--
|
<!--
|
||||||
You can subscribe directly to that folder by following this link:
|
You can subscribe directly to that folder by following this link:
|
||||||
<var:string value="httpAdvisoryURL" const:escapeHTML="NO"/>subscribe?mail-invitation=YES
|
<var:string value="httpAdvisoryURL" const:escapeHTML="NO"/>subscribe?mail-invitation=YES
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
</var:if>
|
</var:if>
|
||||||
|
|
||||||
<var:if condition="isBody">
|
<var:if condition="isBody">
|
||||||
<var:string value="currentUserName" const:escapeHTML="NO"/> has removed you from the access list for his <var:string const:value='"' const:escapeHTML="NO"/><var:string value="resourceName" const:escapeHTML="NO"/><var:string const:value='"' const:escapeHTML="NO"/> folder.
|
<var:string value="currentUserName" const:escapeHTML="NO"/> has removed you from the access list for their <var:string const:value='"' const:escapeHTML="NO"/><var:string value="resourceName" const:escapeHTML="NO"/><var:string const:value='"' const:escapeHTML="NO"/> folder.
|
||||||
<!--
|
<!--
|
||||||
You can unsubscribe directly to that folder by following this link:
|
You can unsubscribe directly to that folder by following this link:
|
||||||
<var:string value="httpAdvisoryURL" const:escapeHTML="NO"/>unsubscribe?mail-invitation=YES
|
<var:string value="httpAdvisoryURL" const:escapeHTML="NO"/>unsubscribe?mail-invitation=YES
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
</var:if>
|
</var:if>
|
||||||
|
|
||||||
<var:if condition="isBody">
|
<var:if condition="isBody">
|
||||||
<var:string value="currentUserName" const:escapeHTML="NO"/> has modified your access rights for his <var:string const:value='"' const:escapeHTML="NO"/><var:string value="resourceName" const:escapeHTML="NO"/><var:string const:value='"' const:escapeHTML="NO"/> folder.
|
<var:string value="currentUserName" const:escapeHTML="NO"/> has modified your access rights for their <var:string const:value='"' const:escapeHTML="NO"/><var:string value="resourceName" const:escapeHTML="NO"/><var:string const:value='"' const:escapeHTML="NO"/> folder.
|
||||||
<!--
|
<!--
|
||||||
You can subscribe directly to that folder by following this link:
|
You can subscribe directly to that folder by following this link:
|
||||||
<var:string value="httpAdvisoryURL" const:escapeHTML="NO"/>subscribe?mail-invitation=YES
|
<var:string value="httpAdvisoryURL" const:escapeHTML="NO"/>subscribe?mail-invitation=YES
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
</var:if>
|
</var:if>
|
||||||
|
|
||||||
<var:if condition="isBody">
|
<var:if condition="isBody">
|
||||||
<var:string value="currentUserName" const:escapeHTML="NO"/> has removed you from the access list for his <var:string const:value='"' const:escapeHTML="NO"/><var:string value="resourceName" const:escapeHTML="NO"/><var:string const:value='"' const:escapeHTML="NO"/> folder.
|
<var:string value="currentUserName" const:escapeHTML="NO"/> has removed you from the access list for their <var:string const:value='"' const:escapeHTML="NO"/><var:string value="resourceName" const:escapeHTML="NO"/><var:string const:value='"' const:escapeHTML="NO"/> folder.
|
||||||
<!--
|
<!--
|
||||||
You can unsubscribe directly to that folder by following this link:
|
You can unsubscribe directly to that folder by following this link:
|
||||||
<var:string value="httpAdvisoryURL" const:escapeHTML="NO"/>unsubscribe?mail-invitation=YES
|
<var:string value="httpAdvisoryURL" const:escapeHTML="NO"/>unsubscribe?mail-invitation=YES
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
</var:if>
|
</var:if>
|
||||||
|
|
||||||
<var:if condition="isBody">
|
<var:if condition="isBody">
|
||||||
<var:string value="currentUserName" const:escapeHTML="NO"/> has modified your access rights for his <var:string const:value='"' const:escapeHTML="NO"/><var:string value="resourceName" const:escapeHTML="NO"/><var:string const:value='"' const:escapeHTML="NO"/> folder.
|
<var:string value="currentUserName" const:escapeHTML="NO"/> has modified your access rights for their <var:string const:value='"' const:escapeHTML="NO"/><var:string value="resourceName" const:escapeHTML="NO"/><var:string const:value='"' const:escapeHTML="NO"/> folder.
|
||||||
<!--
|
<!--
|
||||||
You can subscribe directly to that folder by following this link:
|
You can subscribe directly to that folder by following this link:
|
||||||
<var:string value="httpAdvisoryURL" const:escapeHTML="NO"/>subscribe?mail-invitation=YES
|
<var:string value="httpAdvisoryURL" const:escapeHTML="NO"/>subscribe?mail-invitation=YES
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
</var:if>
|
</var:if>
|
||||||
|
|
||||||
<var:if condition="isBody">
|
<var:if condition="isBody">
|
||||||
<var:string value="currentUserName" const:escapeHTML="NO"/> has removed you from the access list for his <var:string const:value='"' const:escapeHTML="NO"/><var:string value="resourceName" const:escapeHTML="NO"/><var:string const:value='"' const:escapeHTML="NO"/> folder.
|
<var:string value="currentUserName" const:escapeHTML="NO"/> has removed you from the access list for their <var:string const:value='"' const:escapeHTML="NO"/><var:string value="resourceName" const:escapeHTML="NO"/><var:string const:value='"' const:escapeHTML="NO"/> folder.
|
||||||
<!--
|
<!--
|
||||||
You can unsubscribe directly to that folder by following this link:
|
You can unsubscribe directly to that folder by following this link:
|
||||||
<var:string value="httpAdvisoryURL" const:escapeHTML="NO"/>unsubscribe?mail-invitation=YES
|
<var:string value="httpAdvisoryURL" const:escapeHTML="NO"/>unsubscribe?mail-invitation=YES
|
||||||
|
|
Loading…
Reference in New Issue