From 0959a88ea9c15585a3515385be85a1a8071aefeb Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 3 Jun 2010 14:43:38 +0000 Subject: [PATCH] Monotone-Parent: b8ad0061e865a522c79c6a19bc8d7841469af81a Monotone-Revision: 7f2779135e9501efcfbb73fce0b3d244687ecaa4 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-06-03T14:43:38 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 27 ++++++++ .../Localizable.strings | 4 +- UI/Common/Czech.lproj/Localizable.strings | 4 +- UI/Common/Dutch.lproj/Localizable.strings | 4 +- UI/Common/English.lproj/Localizable.strings | 4 +- UI/Common/French.lproj/Localizable.strings | 4 +- UI/Common/German.lproj/Localizable.strings | 4 +- UI/Common/Hungarian.lproj/Localizable.strings | 4 +- UI/Common/Italian.lproj/Localizable.strings | 4 +- UI/Common/Russian.lproj/Localizable.strings | 4 +- UI/Common/Spanish.lproj/Localizable.strings | 4 +- UI/Common/Swedish.lproj/Localizable.strings | 4 +- UI/Common/UIxAclEditor.m | 3 +- UI/Common/UIxUserRightsEditor.m | 6 ++ UI/Common/Welsh.lproj/Localizable.strings | 4 +- .../Localizable.strings | 4 +- UI/Contacts/Czech.lproj/Localizable.strings | 4 +- UI/Contacts/Dutch.lproj/Localizable.strings | 4 +- UI/Contacts/English.lproj/Localizable.strings | 4 +- UI/Contacts/French.lproj/Localizable.strings | 4 +- UI/Contacts/German.lproj/Localizable.strings | 4 +- .../Hungarian.lproj/Localizable.strings | 4 +- UI/Contacts/Italian.lproj/Localizable.strings | 4 +- UI/Contacts/Russian.lproj/Localizable.strings | 4 +- UI/Contacts/Spanish.lproj/Localizable.strings | 4 +- UI/Contacts/Swedish.lproj/Localizable.strings | 4 +- UI/Contacts/Welsh.lproj/Localizable.strings | 4 +- .../Localizable.strings | 4 +- UI/Scheduler/Czech.lproj/Localizable.strings | 4 +- UI/Scheduler/Dutch.lproj/Localizable.strings | 4 +- .../English.lproj/Localizable.strings | 4 +- UI/Scheduler/French.lproj/Localizable.strings | 4 +- UI/Scheduler/German.lproj/Localizable.strings | 4 +- .../Hungarian.lproj/Localizable.strings | 4 +- .../Italian.lproj/Localizable.strings | 4 +- .../Russian.lproj/Localizable.strings | 4 +- .../Spanish.lproj/Localizable.strings | 4 +- .../Swedish.lproj/Localizable.strings | 4 +- UI/Scheduler/UIxCalUserRightsEditor.m | 21 +++---- UI/Scheduler/Welsh.lproj/Localizable.strings | 4 +- .../UIxContactsUserRightsEditor.wox | 48 ++++++++------ .../SchedulerUI/UIxCalUserRightsEditor.wox | 41 +++++++----- UI/Templates/UIxAclEditor.wox | 12 ++-- UI/WebServerResources/ContactsUI.js | 2 +- UI/WebServerResources/UIxAclEditor.css | 19 +++++- UI/WebServerResources/UIxAclEditor.js | 59 +++++++++++------- UI/WebServerResources/abcard-anonymous.png | Bin 0 -> 546 bytes UI/WebServerResources/abcard-anyone.png | Bin 0 -> 489 bytes UI/WebServerResources/generic.js | 16 +++++ 49 files changed, 280 insertions(+), 118 deletions(-) create mode 100644 UI/WebServerResources/abcard-anonymous.png create mode 100644 UI/WebServerResources/abcard-anyone.png diff --git a/ChangeLog b/ChangeLog index 9addff593..3686ee661 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,30 @@ +2010-06-03 Wolfgang Sourdeau + + * UI/WebServerResources/generic.js (CurrentModule): new function + that returns the name of the currently active module. + + * UI/WebServerResources/UIxAclEditor.js (addUser): take into + account the fact that the "default roles" button has been replaced + with a new "authenticated users" entry and that we want to keep + that entry at the end of the list. + (nodeForUser): added a "canSubscribe" parameter that determines + whether the "subcribe user" button should be displayed. + (openRightsForUserId): when the user id is "anonymous", the acl + window is reduced by 42 pixels. If the window to display is the + one pertaining to contacts rights, 21 pixels are substracted again. + (openRightsForDefaultUser): removed function. + + * UI/Scheduler/UIxCalUserRightsEditor.m (-objectRights): the list + of rights must be limited to the immutative ones whe the active + user is "anonymous". + + * UI/Common/UIxUserRightsEditor.m (-userIsAnonymousUser): new + accessor that returns whether the selected user is "anonymous", in + which case certain UI elements need to be adapted. + + * UI/Common/UIxAclEditor.m (-_prepareUsers): added support for + "anonymous" user id. + 2010-06-02 Wolfgang Sourdeau * UI/WebServerResources/*.js: replaced all remaining calls to diff --git a/UI/Common/BrazilianPortuguese.lproj/Localizable.strings b/UI/Common/BrazilianPortuguese.lproj/Localizable.strings index bbc4a8729..49d32f463 100644 --- a/UI/Common/BrazilianPortuguese.lproj/Localizable.strings +++ b/UI/Common/BrazilianPortuguese.lproj/Localizable.strings @@ -28,9 +28,11 @@ "Add..." = "Adicionar..."; "Remove" = "Remover"; -"Default Roles" = "Papéis Padrão"; "Subscribe User" = "Subscribe User"; +"Any Authenticated User" = "Any Authenticated User"; +"Public Access" = "Public Access"; + "Sorry, the user rights can not be configured for that object." = "Desculpe, os direitos de usuário não podem ser modificados para este objeto."; /* generic.js */ diff --git a/UI/Common/Czech.lproj/Localizable.strings b/UI/Common/Czech.lproj/Localizable.strings index 43d532dd3..51bad0891 100644 --- a/UI/Common/Czech.lproj/Localizable.strings +++ b/UI/Common/Czech.lproj/Localizable.strings @@ -28,9 +28,11 @@ "Add..." = "Přidat..."; "Remove" = "Odebrat"; -"Default Roles" = "Výchozí role"; "Subscribe User" = "Subscribe User"; +"Any Authenticated User" = "Any Authenticated User"; +"Public Access" = "Public Access"; + "Sorry, the user rights can not be configured for that object." = "Omlouváme se, ale uživatelská práva pro tento objekt nemohou být nastavena."; /* generic.js */ diff --git a/UI/Common/Dutch.lproj/Localizable.strings b/UI/Common/Dutch.lproj/Localizable.strings index 38b95b47d..b03008b42 100644 --- a/UI/Common/Dutch.lproj/Localizable.strings +++ b/UI/Common/Dutch.lproj/Localizable.strings @@ -28,9 +28,11 @@ "Add..." = "Toevoegen..."; "Remove" = "Verwijderen"; -"Default Roles" = "Standaardmachtigingen"; "Subscribe User" = "Gebruiker abonneren"; +"Any Authenticated User" = "Any Authenticated User"; +"Public Access" = "Public Access"; + "Sorry, the user rights can not be configured for that object." = "De machtigingen kunnen niet worden ingesteld voor dit object."; /* generic.js */ diff --git a/UI/Common/English.lproj/Localizable.strings b/UI/Common/English.lproj/Localizable.strings index d0b18a078..f6fd28472 100644 --- a/UI/Common/English.lproj/Localizable.strings +++ b/UI/Common/English.lproj/Localizable.strings @@ -28,9 +28,11 @@ "Add..." = "Add..."; "Remove" = "Remove"; -"Default Roles" = "Default Roles"; "Subscribe User" = "Subscribe User"; +"Any Authenticated User" = "Any Authenticated User"; +"Public Access" = "Public Access"; + "Sorry, the user rights can not be configured for that object." = "Sorry, the user rights can not be configured for that object."; /* generic.js */ diff --git a/UI/Common/French.lproj/Localizable.strings b/UI/Common/French.lproj/Localizable.strings index 0d5f084f5..9553aebbd 100644 --- a/UI/Common/French.lproj/Localizable.strings +++ b/UI/Common/French.lproj/Localizable.strings @@ -28,9 +28,11 @@ "Add..." = "Ajouter..."; "Remove" = "Enlever"; -"Default Roles" = "Rôles par défaut"; "Subscribe User" = "Abonner l'utilisateur"; +"Any Authenticated User" = "Tout utilisateur identifié"; +"Public Access" = "Accès public"; + "Sorry, the user rights can not be configured for that object." = "Sorry, the user rights can not be configured for that object."; /* generic.js */ diff --git a/UI/Common/German.lproj/Localizable.strings b/UI/Common/German.lproj/Localizable.strings index 83de902ef..aaf8f80ca 100644 --- a/UI/Common/German.lproj/Localizable.strings +++ b/UI/Common/German.lproj/Localizable.strings @@ -28,9 +28,11 @@ "Add..." = "Hinzufügen..."; "Remove" = "Löschen"; -"Default Roles" = "Standardrechte"; "Subscribe User" = "Subscribe User"; +"Any Authenticated User" = "Any Authenticated User"; +"Public Access" = "Public Access"; + "Sorry, the user rights can not be configured for that object." = "Leider können die Benutzerrechte für dieses Objekt nicht konfiguriert werden."; /* generic.js */ diff --git a/UI/Common/Hungarian.lproj/Localizable.strings b/UI/Common/Hungarian.lproj/Localizable.strings index 7e6e4f64f..1f7432d12 100644 --- a/UI/Common/Hungarian.lproj/Localizable.strings +++ b/UI/Common/Hungarian.lproj/Localizable.strings @@ -28,9 +28,11 @@ "Add..." = "Hozzáadás..."; "Remove" = "Törlés"; -"Default Roles" = "Alapértelmezett jogok"; "Subscribe User" = "Subscribe User"; +"Any Authenticated User" = "Any Authenticated User"; +"Public Access" = "Public Access"; + "Sorry, the user rights can not be configured for that object." = "Sajnálom, erre az objektumra nem állíthatók be felhasználói jogosultságok."; /* generic.js */ diff --git a/UI/Common/Italian.lproj/Localizable.strings b/UI/Common/Italian.lproj/Localizable.strings index f328c2593..e41c6f7e2 100644 --- a/UI/Common/Italian.lproj/Localizable.strings +++ b/UI/Common/Italian.lproj/Localizable.strings @@ -28,9 +28,11 @@ "Add..." = "Aggiungi..."; "Remove" = "Rimuovi"; -"Default Roles" = "Permessi predefiniti"; "Subscribe User" = "Subscribe User"; +"Any Authenticated User" = "Any Authenticated User"; +"Public Access" = "Public Access"; + "Sorry, the user rights can not be configured for that object." = "Non è possibile configurare i permessi per questo oggetto."; /* generic.js */ diff --git a/UI/Common/Russian.lproj/Localizable.strings b/UI/Common/Russian.lproj/Localizable.strings index ab8132329..0d64329ee 100644 --- a/UI/Common/Russian.lproj/Localizable.strings +++ b/UI/Common/Russian.lproj/Localizable.strings @@ -28,9 +28,11 @@ "Add..." = "Add..."; "Remove" = "Remove"; -"Default Roles" = "Контроль доступа для всех"; "Subscribe User" = "Subscribe User"; +"Any Authenticated User" = "Any Authenticated User"; +"Public Access" = "Public Access"; + "Sorry, the user rights can not be configured for that object." = "Извините, для данного объекта невозможно настроить права доступа."; /* generic.js */ diff --git a/UI/Common/Spanish.lproj/Localizable.strings b/UI/Common/Spanish.lproj/Localizable.strings index 815a43409..5aafb7b33 100644 --- a/UI/Common/Spanish.lproj/Localizable.strings +++ b/UI/Common/Spanish.lproj/Localizable.strings @@ -28,9 +28,11 @@ "Add..." = "Añadir..."; "Remove" = "Borrar"; -"Default Roles" = "Roles por defecto"; "Subscribe User" = "Subscribe User"; +"Any Authenticated User" = "Any Authenticated User"; +"Public Access" = "Public Access"; + "Sorry, the user rights can not be configured for that object." = "Sorry, the user rights can not be configured for that object."; /* generic.js */ diff --git a/UI/Common/Swedish.lproj/Localizable.strings b/UI/Common/Swedish.lproj/Localizable.strings index 9715728bb..44f48dbbd 100644 --- a/UI/Common/Swedish.lproj/Localizable.strings +++ b/UI/Common/Swedish.lproj/Localizable.strings @@ -28,9 +28,11 @@ "Add..." = "Lägg till..."; "Remove" = "Ta bort"; -"Default Roles" = "Standardroller"; "Subscribe User" = "Subscribe User"; +"Any Authenticated User" = "Any Authenticated User"; +"Public Access" = "Public Access"; + "Sorry, the user rights can not be configured for that object." = "Tyvärr, användarrättigheterna kan inte konfigureras för objektet."; /* generic.js */ diff --git a/UI/Common/UIxAclEditor.m b/UI/Common/UIxAclEditor.m index c9684bdde..4c3589fac 100644 --- a/UI/Common/UIxAclEditor.m +++ b/UI/Common/UIxAclEditor.m @@ -128,7 +128,8 @@ // NOTE: don't remove the prefix if we want to identify the lists visually currentUID = [currentUID substringFromIndex: 1]; if (!([currentUID isEqualToString: ownerLogin] - || [currentUID isEqualToString: defaultUserID])) + || [currentUID isEqualToString: defaultUserID] + || [currentUID isEqualToString: @"anonymous"])) [users addObjectUniquely: currentUID]; currentUID = [aclsEnum nextObject]; } diff --git a/UI/Common/UIxUserRightsEditor.m b/UI/Common/UIxUserRightsEditor.m index f937260c4..8b71e5329 100644 --- a/UI/Common/UIxUserRightsEditor.m +++ b/UI/Common/UIxUserRightsEditor.m @@ -70,6 +70,11 @@ return [uid isEqualToString: defaultUserID]; } +- (BOOL) userIsAnonymousUser +{ + return [uid isEqualToString: @"anonymous"]; +} + - (NSString *) userDisplayName { SOGoUserManager *um; @@ -99,6 +104,7 @@ um = [SOGoUserManager sharedUserManager]; if ([newUID isEqualToString: defaultUserID] + || [newUID isEqualToString: @"anonymous"] || [[um getEmailForUID: newUID] length] > 0) { if (![newUID hasPrefix: @"@"]) diff --git a/UI/Common/Welsh.lproj/Localizable.strings b/UI/Common/Welsh.lproj/Localizable.strings index 498eaec2e..9b4706480 100644 --- a/UI/Common/Welsh.lproj/Localizable.strings +++ b/UI/Common/Welsh.lproj/Localizable.strings @@ -28,9 +28,11 @@ "Add..." = "Ychwanegu..."; "Remove" = "Dileu"; -"Default Roles" = "Rolau Gwreiddiol"; "Subscribe User" = "Subscribe User"; +"Any Authenticated User" = "Any Authenticated User"; +"Public Access" = "Public Access"; + "Sorry, the user rights can not be configured for that object." = "Sori, ni all hawliau'r defnyddiwr cael ei newid ar gyfer y gwrthrych hwn."; /* generic.js */ diff --git a/UI/Contacts/BrazilianPortuguese.lproj/Localizable.strings b/UI/Contacts/BrazilianPortuguese.lproj/Localizable.strings index ab0cb83c3..c2d1689b4 100644 --- a/UI/Contacts/BrazilianPortuguese.lproj/Localizable.strings +++ b/UI/Contacts/BrazilianPortuguese.lproj/Localizable.strings @@ -143,9 +143,11 @@ "Unable to subscribe to that folder!" = "Não foi possível inscrever-se a esta pasta."; -"Default Roles" = "Papéis Padrão"; "User rights for:" = "Direitos de:"; +"Any Authenticated User" = "Any Authenticated User"; +"Public Access" = "Public Access"; + "This person can add cards to this addressbook." = "Essa pessoa pode adicionar contatos ao meu catálogo."; "This person can edit the cards of this addressbook." diff --git a/UI/Contacts/Czech.lproj/Localizable.strings b/UI/Contacts/Czech.lproj/Localizable.strings index f01367b56..02dbc8a00 100644 --- a/UI/Contacts/Czech.lproj/Localizable.strings +++ b/UI/Contacts/Czech.lproj/Localizable.strings @@ -143,9 +143,11 @@ "Unable to subscribe to that folder!" = "Nemůžete se přihlásit k odběru této složky!"; -"Default Roles" = "Výchozí role"; "User rights for:" = "Uživatelská práva pro:"; +"Any Authenticated User" = "Any Authenticated User"; +"Public Access" = "Public Access"; + "This person can add cards to this addressbook." = "Tato osoba může přidávat kontakty do této složky."; "This person can edit the cards of this addressbook." diff --git a/UI/Contacts/Dutch.lproj/Localizable.strings b/UI/Contacts/Dutch.lproj/Localizable.strings index 3cad750d0..966defd69 100644 --- a/UI/Contacts/Dutch.lproj/Localizable.strings +++ b/UI/Contacts/Dutch.lproj/Localizable.strings @@ -143,9 +143,11 @@ "Unable to subscribe to that folder!" = "Abonneren op deze map mislukt!"; -"Default Roles" = "Standaardmachtigingen"; "User rights for:" = "Machtigingen voor:"; +"Any Authenticated User" = "Any Authenticated User"; +"Public Access" = "Public Access"; + "This person can add cards to this addressbook." = "Deze persoon mag contactpersonen toevoegen aan dit adresboek."; "This person can edit the cards of this addressbook." diff --git a/UI/Contacts/English.lproj/Localizable.strings b/UI/Contacts/English.lproj/Localizable.strings index 7854571b1..07ef3fe12 100644 --- a/UI/Contacts/English.lproj/Localizable.strings +++ b/UI/Contacts/English.lproj/Localizable.strings @@ -143,9 +143,11 @@ "Unable to subscribe to that folder!" = "Unable to subscribe to that folder."; -"Default Roles" = "Default Roles"; "User rights for:" = "User rights for:"; +"Any Authenticated User" = "Any Authenticated User"; +"Public Access" = "Public Access"; + "This person can add cards to this addressbook." = "This person can add cards to this addressbook."; "This person can edit the cards of this addressbook." diff --git a/UI/Contacts/French.lproj/Localizable.strings b/UI/Contacts/French.lproj/Localizable.strings index d54b26a73..f726638eb 100644 --- a/UI/Contacts/French.lproj/Localizable.strings +++ b/UI/Contacts/French.lproj/Localizable.strings @@ -143,9 +143,11 @@ "Unable to subscribe to that folder!" = "Impossible de vous inscrire à ce dossier."; -"Default Roles" = "Rôles par défaut"; "User rights for:" = "Autorisations pour :"; +"Any Authenticated User" = "Tout utilisateur identifié"; +"Public Access" = "Accès public"; + "This person can add cards to this addressbook." = "Cette personne peut ajouter des fiches à ce carnet d'adresses."; "This person can edit the cards of this addressbook." diff --git a/UI/Contacts/German.lproj/Localizable.strings b/UI/Contacts/German.lproj/Localizable.strings index cf8521510..321e7001b 100644 --- a/UI/Contacts/German.lproj/Localizable.strings +++ b/UI/Contacts/German.lproj/Localizable.strings @@ -143,9 +143,11 @@ "Unable to subscribe to that folder!" = "Abonnieren des Ordners nicht möglich!"; -"Default Roles" = "Standardrechte"; "User rights for:" = "Benutzerrechte für:"; +"Any Authenticated User" = "Any Authenticated User"; +"Public Access" = "Public Access"; + "This person can add cards to this addressbook." = "Diese Person kann neue Karten zu diesem Adressbuch hinzufügen."; "This person can edit the cards of this addressbook." diff --git a/UI/Contacts/Hungarian.lproj/Localizable.strings b/UI/Contacts/Hungarian.lproj/Localizable.strings index 5c0d1e72f..bb7875a91 100644 --- a/UI/Contacts/Hungarian.lproj/Localizable.strings +++ b/UI/Contacts/Hungarian.lproj/Localizable.strings @@ -143,9 +143,11 @@ "Unable to subscribe to that folder!" = "Erre a mappára nem lehet feliratkozni."; -"Default Roles" = "Alapértelmezett jogok"; "User rights for:" = "Felhasználói jogosultságok:"; +"Any Authenticated User" = "Any Authenticated User"; +"Public Access" = "Public Access"; + "This person can add cards to this addressbook." = "Az alábbi személy hozzáadhat névjegyeket ehhez a címjegyzékhez."; "This person can edit the cards of this addressbook." diff --git a/UI/Contacts/Italian.lproj/Localizable.strings b/UI/Contacts/Italian.lproj/Localizable.strings index 74f336f51..07de150e5 100644 --- a/UI/Contacts/Italian.lproj/Localizable.strings +++ b/UI/Contacts/Italian.lproj/Localizable.strings @@ -143,9 +143,11 @@ "Unable to subscribe to that folder!" = "Non puoi sottoscrivere la cartella!"; -"Default Roles" = "Permessi predefiniti"; "User rights for:" = "Permessi per:"; +"Any Authenticated User" = "Any Authenticated User"; +"Public Access" = "Public Access"; + "This person can add cards to this addressbook." = "Questa persona può aggiungere contatti a questa rubrica."; "This person can edit the cards of this addressbook." diff --git a/UI/Contacts/Russian.lproj/Localizable.strings b/UI/Contacts/Russian.lproj/Localizable.strings index 861aeb81c..dfce83fb4 100644 --- a/UI/Contacts/Russian.lproj/Localizable.strings +++ b/UI/Contacts/Russian.lproj/Localizable.strings @@ -128,9 +128,11 @@ "Unable to subscribe to that folder!" = "Unable to subscribe to that folder."; -"Default Roles" = "Default Roles"; "User rights for:" = "User rights for:"; +"Any Authenticated User" = "Any Authenticated User"; +"Public Access" = "Public Access"; + "This person can add cards to this addressbook." = "This person can add cards to this addressbook."; "This person can edit the cards of this addressbook." diff --git a/UI/Contacts/Spanish.lproj/Localizable.strings b/UI/Contacts/Spanish.lproj/Localizable.strings index 76d33cac1..b2d32382c 100644 --- a/UI/Contacts/Spanish.lproj/Localizable.strings +++ b/UI/Contacts/Spanish.lproj/Localizable.strings @@ -143,9 +143,11 @@ "Unable to subscribe to that folder!" = "No puede suscribirse a esta carpeta."; -"Default Roles" = "Roles por defecto"; "User rights for:" = "Permisos para:"; +"Any Authenticated User" = "Any Authenticated User"; +"Public Access" = "Public Access"; + "This person can add cards to this addressbook." = "Esta persona puede añadir nuevos contactos a esta libreta."; "This person can edit the cards of this addressbook." diff --git a/UI/Contacts/Swedish.lproj/Localizable.strings b/UI/Contacts/Swedish.lproj/Localizable.strings index a8ebac646..9a7b09ea8 100644 --- a/UI/Contacts/Swedish.lproj/Localizable.strings +++ b/UI/Contacts/Swedish.lproj/Localizable.strings @@ -143,9 +143,11 @@ "Unable to subscribe to that folder!" = "Du kan inte prenumrera på mappen."; -"Default Roles" = "Standardroller"; "User rights for:" = "Användarrättigheter för:"; +"Any Authenticated User" = "Any Authenticated User"; +"Public Access" = "Public Access"; + "This person can add cards to this addressbook." = "Personen kan lägga till addresskort i adressboken."; "This person can edit the cards of this addressbook." diff --git a/UI/Contacts/Welsh.lproj/Localizable.strings b/UI/Contacts/Welsh.lproj/Localizable.strings index dd9b8720c..168fd8d65 100644 --- a/UI/Contacts/Welsh.lproj/Localizable.strings +++ b/UI/Contacts/Welsh.lproj/Localizable.strings @@ -127,9 +127,11 @@ "Unable to subscribe to that folder!" = "Methu tanysgrifio i'r ffolder yna."; -"Default Roles" = "Rolau Gwreiddiol"; "User rights for:" = "Hawliau defnyddiwr i:"; +"Any Authenticated User" = "Any Authenticated User"; +"Public Access" = "Public Access"; + "This person can add cards to this addressbook." = "Gall y person hwn ychwanegu cardiau i'r llyfr cyfeiriadau yma."; "This person can edit the cards of this addressbook." diff --git a/UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings b/UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings index fdcfb6802..b91a4a07c 100644 --- a/UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings +++ b/UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings @@ -131,9 +131,11 @@ /* acls */ -"Default Roles" = "Papéis Padrão"; "User rights for:" = "Direitos de:"; +"Any Authenticated User" = "Any Authenticated User"; +"Public Access" = "Public Access"; + "label_Public" = "Público"; "label_Private" = "Privado"; "label_Confidential" = "Confidencial"; diff --git a/UI/Scheduler/Czech.lproj/Localizable.strings b/UI/Scheduler/Czech.lproj/Localizable.strings index 4753074bc..7d57c7159 100644 --- a/UI/Scheduler/Czech.lproj/Localizable.strings +++ b/UI/Scheduler/Czech.lproj/Localizable.strings @@ -131,9 +131,11 @@ /* acls */ -"Default Roles" = "Výchozí role"; "User rights for:" = "Uživatelská práva pro:"; +"Any Authenticated User" = "Any Authenticated User"; +"Public Access" = "Public Access"; + "label_Public" = "Veřejné"; "label_Private" = "Soukromé"; "label_Confidential" = "Důvěrné"; diff --git a/UI/Scheduler/Dutch.lproj/Localizable.strings b/UI/Scheduler/Dutch.lproj/Localizable.strings index 64e35a69f..e3908139c 100644 --- a/UI/Scheduler/Dutch.lproj/Localizable.strings +++ b/UI/Scheduler/Dutch.lproj/Localizable.strings @@ -131,9 +131,11 @@ /* acls */ -"Default Roles" = "Standaardmachtigingen"; "User rights for:" = "Machtigingen voor:"; +"Any Authenticated User" = "Any Authenticated User"; +"Public Access" = "Public Access"; + "label_Public" = "Publiek"; "label_Private" = "Privaat"; "label_Confidential" = "Vertrouwelijk"; diff --git a/UI/Scheduler/English.lproj/Localizable.strings b/UI/Scheduler/English.lproj/Localizable.strings index b33094d42..af9825b12 100644 --- a/UI/Scheduler/English.lproj/Localizable.strings +++ b/UI/Scheduler/English.lproj/Localizable.strings @@ -131,9 +131,11 @@ /* acls */ -"Default Roles" = "Default Roles"; "User rights for:" = "User rights for:"; +"Any Authenticated User" = "Any Authenticated User"; +"Public Access" = "Public Access"; + "label_Public" = "Public"; "label_Private" = "Private"; "label_Confidential" = "Confidential"; diff --git a/UI/Scheduler/French.lproj/Localizable.strings b/UI/Scheduler/French.lproj/Localizable.strings index 4eb003ad4..44a17be34 100644 --- a/UI/Scheduler/French.lproj/Localizable.strings +++ b/UI/Scheduler/French.lproj/Localizable.strings @@ -131,9 +131,11 @@ /* acls */ -"Default Roles" = "Rôles par défaut"; "User rights for:" = "Autorisations pour :"; +"Any Authenticated User" = "Tout utilisateur identifié"; +"Public Access" = "Accès public"; + "label_Public" = "Public"; "label_Private" = "Privé"; "label_Confidential" = "Confidentiel"; diff --git a/UI/Scheduler/German.lproj/Localizable.strings b/UI/Scheduler/German.lproj/Localizable.strings index ebe75189e..6fbec4fc9 100644 --- a/UI/Scheduler/German.lproj/Localizable.strings +++ b/UI/Scheduler/German.lproj/Localizable.strings @@ -131,9 +131,11 @@ /* acls */ -"Default Roles" = "Standardrechte"; "User rights for:" = "Benutzerrechte für:"; +"Any Authenticated User" = "Any Authenticated User"; +"Public Access" = "Public Access"; + "label_Public" = "Öffentlich"; "label_Private" = "Privat"; "label_Confidential" = "Vertraulich"; diff --git a/UI/Scheduler/Hungarian.lproj/Localizable.strings b/UI/Scheduler/Hungarian.lproj/Localizable.strings index 55ac0b840..053650a28 100644 --- a/UI/Scheduler/Hungarian.lproj/Localizable.strings +++ b/UI/Scheduler/Hungarian.lproj/Localizable.strings @@ -131,9 +131,11 @@ /* acls */ -"Default Roles" = "Alapértelmezett jogok"; "User rights for:" = "Felhasználói jogosultságok:"; +"Any Authenticated User" = "Any Authenticated User"; +"Public Access" = "Public Access"; + "label_Public" = "Nyilvános"; "label_Private" = "Magán"; "label_Confidential" = "Bizalmas"; diff --git a/UI/Scheduler/Italian.lproj/Localizable.strings b/UI/Scheduler/Italian.lproj/Localizable.strings index 25e015201..ff55ff9b5 100644 --- a/UI/Scheduler/Italian.lproj/Localizable.strings +++ b/UI/Scheduler/Italian.lproj/Localizable.strings @@ -131,9 +131,11 @@ /* acls */ -"Default Roles" = "Permessi predefiniti"; "User rights for:" = "Permessi per:"; +"Any Authenticated User" = "Any Authenticated User"; +"Public Access" = "Public Access"; + "label_Public" = "Pubblico"; "label_Private" = "Privato"; "label_Confidential" = "Confidenziale"; diff --git a/UI/Scheduler/Russian.lproj/Localizable.strings b/UI/Scheduler/Russian.lproj/Localizable.strings index 1c8d5cd29..9b3901fc4 100644 --- a/UI/Scheduler/Russian.lproj/Localizable.strings +++ b/UI/Scheduler/Russian.lproj/Localizable.strings @@ -131,9 +131,11 @@ /* acls */ -"Default Roles" = "Роли по умолчанию"; "User rights for:" = "Права пользователя для:"; +"Any Authenticated User" = "Any Authenticated User"; +"Public Access" = "Public Access"; + "label_Public" = "Публичное событие"; "label_Private" = "Личное событие"; "label_Confidential" = "Показывать только время и дату"; diff --git a/UI/Scheduler/Spanish.lproj/Localizable.strings b/UI/Scheduler/Spanish.lproj/Localizable.strings index 0563b37f7..18cee0987 100644 --- a/UI/Scheduler/Spanish.lproj/Localizable.strings +++ b/UI/Scheduler/Spanish.lproj/Localizable.strings @@ -131,9 +131,11 @@ /* acls */ -"Default Roles" = "Roles por defecto"; "User rights for:" = "Permisos para:"; +"Any Authenticated User" = "Any Authenticated User"; +"Public Access" = "Public Access"; + "label_Public" = "Público"; "label_Private" = "Privado"; "label_Confidential" = "Confidencial"; diff --git a/UI/Scheduler/Swedish.lproj/Localizable.strings b/UI/Scheduler/Swedish.lproj/Localizable.strings index 251a208c9..5fa6ad50e 100644 --- a/UI/Scheduler/Swedish.lproj/Localizable.strings +++ b/UI/Scheduler/Swedish.lproj/Localizable.strings @@ -131,9 +131,11 @@ /* acls */ -"Default Roles" = "Standardroller"; "User rights for:" = "Användarrättigheter för:"; +"Any Authenticated User" = "Any Authenticated User"; +"Public Access" = "Public Access"; + "label_Public" = "Publikt"; "label_Private" = "Privat"; "label_Confidential" = "Konfidentiellt"; diff --git a/UI/Scheduler/UIxCalUserRightsEditor.m b/UI/Scheduler/UIxCalUserRightsEditor.m index 5461c3cad..383ae374e 100644 --- a/UI/Scheduler/UIxCalUserRightsEditor.m +++ b/UI/Scheduler/UIxCalUserRightsEditor.m @@ -85,16 +85,11 @@ NSEnumerator *commonRights; NSString *currentCommonRight; - rightsForType = [NSMutableArray new]; - [rightsForType autorelease]; + rightsForType = [NSMutableArray arrayWithCapacity: 5]; commonRights = [[self objectRights] objectEnumerator]; - currentCommonRight = [commonRights nextObject]; - while (currentCommonRight) - { - [rightsForType addObject: [NSString stringWithFormat: @"%@%@", - type, currentCommonRight]]; - currentCommonRight = [commonRights nextObject]; - } + while ((currentCommonRight = [commonRights nextObject])) + [rightsForType addObject: [NSString stringWithFormat: @"%@%@", + type, currentCommonRight]]; return rightsForType; } @@ -137,9 +132,11 @@ - (NSArray *) objectRights { - return - [NSArray arrayWithObjects: - @"Viewer", @"DAndTViewer", @"Modifier", @"Responder", @"None", nil]; + return ([uid isEqualToString: @"anonymous"] + ? [NSArray arrayWithObjects: @"Viewer", @"DAndTViewer", @"None", + nil] + : [NSArray arrayWithObjects: @"Viewer", @"DAndTViewer", @"Modifier", + @"Responder", @"None", nil]); } - (void) setCurrentRight: (NSString *) newCurrentRight diff --git a/UI/Scheduler/Welsh.lproj/Localizable.strings b/UI/Scheduler/Welsh.lproj/Localizable.strings index 50bc6d823..ce2d4dc49 100644 --- a/UI/Scheduler/Welsh.lproj/Localizable.strings +++ b/UI/Scheduler/Welsh.lproj/Localizable.strings @@ -131,9 +131,11 @@ /* acls */ -"Default Roles" = "Rolau gwreiddiol"; "User rights for:" = "hawliau defnyddiwr i:"; +"Any Authenticated User" = "Any Authenticated User"; +"Public Access" = "Public Access"; + "label_Public" = "Cyhoeddus"; "label_Private" = "Preifat"; "label_Confidential" = "Cyfrinachol"; diff --git a/UI/Templates/ContactsUI/UIxContactsUserRightsEditor.wox b/UI/Templates/ContactsUI/UIxContactsUserRightsEditor.wox index 80f33d4df..1993f0f3d 100644 --- a/UI/Templates/ContactsUI/UIxContactsUserRightsEditor.wox +++ b/UI/Templates/ContactsUI/UIxContactsUserRightsEditor.wox @@ -14,33 +14,43 @@
- - - + + +
- -
+ +

- +
- +
- - - + +
@@ -32,17 +38,20 @@ />
-
- -
- -
+
+ +
+ +
diff --git a/UI/Templates/UIxAclEditor.wox b/UI/Templates/UIxAclEditor.wox index 300df5598..2a6dd62a6 100644 --- a/UI/Templates/UIxAclEditor.wox +++ b/UI/Templates/UIxAclEditor.wox @@ -35,8 +35,6 @@
- - @@ -45,12 +43,12 @@
  • - - + >
  • +