From 1858da0c70276f44f94a13562fd315cc31616284 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Tue, 6 Jan 2009 15:40:27 +0000 Subject: [PATCH] See ChangeLog Monotone-Parent: 960e78b7d7470774c06a955e2a985fc80998d735 Monotone-Revision: 0ec0d799e947a37fe72a1bf6e3d5b25ac260164f Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2009-01-06T15:40:27 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 9 ++++++++ .../Dutch.lproj/Localizable.strings | 7 +++++++ .../English.lproj/Localizable.strings | 7 +++++++ .../French.lproj/Localizable.strings | 7 +++++++ .../German.lproj/Localizable.strings | 7 +++++++ .../Italian.lproj/Localizable.strings | 7 +++++++ .../Appointments/SOGoCalendarComponent.m | 21 ++++++++++++++++++- .../Spanish.lproj/Localizable.strings | 7 +++++++ UI/SOGoUI/SOGoAptFormatter.m | 1 + UI/Scheduler/UIxCalView.m | 2 -- 10 files changed, 72 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9e7569438..95827b606 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-01-06 Ludovic Marcotte + + * SoObjects/Appointments/SOGoCalendarComponent.m + ([SOGoCalendarComponent -_filterComponent:]): + We now set the proper component summary just like + we do in the Web UI when 'securing' the + returned component. Also adjusted the Localizable.strings + files accordingly. + 2008-12-30 Ludovic Marcotte * Dropped the following files: diff --git a/SoObjects/Appointments/Dutch.lproj/Localizable.strings b/SoObjects/Appointments/Dutch.lproj/Localizable.strings index 4fb99a8f7..d5bf0c078 100644 --- a/SoObjects/Appointments/Dutch.lproj/Localizable.strings +++ b/SoObjects/Appointments/Dutch.lproj/Localizable.strings @@ -1 +1,8 @@ "Personal Calendar" = "Persoonlijke agenda"; +vevent_class0 = "(Publieke afspraak)"; +vevent_class1 = "(Privé-afspraak)"; +vevent_class2 = "(Vertrouwelijke afspraak)"; + +vtodo_class0 = "(Publieke taak)"; +vtodo_class1 = "(Privétaak)"; +vtodo_class2 = "(Vertrouwelijke taak)"; \ No newline at end of file diff --git a/SoObjects/Appointments/English.lproj/Localizable.strings b/SoObjects/Appointments/English.lproj/Localizable.strings index 95feda9fd..1b0915325 100644 --- a/SoObjects/Appointments/English.lproj/Localizable.strings +++ b/SoObjects/Appointments/English.lproj/Localizable.strings @@ -1 +1,8 @@ "Personal Calendar" = "Personal Calendar"; +vevent_class0 = "(Public event)"; +vevent_class1 = "(Private event)"; +vevent_class2 = "(Confidential event)"; + +vtodo_class0 = "(Public task)"; +vtodo_class1 = "(Private task)"; +vtodo_class2 = "(Confidential task)"; diff --git a/SoObjects/Appointments/French.lproj/Localizable.strings b/SoObjects/Appointments/French.lproj/Localizable.strings index 11b333c2a..c3975593d 100644 --- a/SoObjects/Appointments/French.lproj/Localizable.strings +++ b/SoObjects/Appointments/French.lproj/Localizable.strings @@ -1 +1,8 @@ "Personal Calendar" = "Agenda personnel"; +vevent_class0 = "(Événement public)"; +vevent_class1 = "(Événement privé)"; +vevent_class2 = "(Événement confidentiel)"; + +vtodo_class0 = "(Tâche publique)"; +vtodo_class1 = "(Tâche privée)"; +vtodo_class2 = "(Tâche confidentielle)"; diff --git a/SoObjects/Appointments/German.lproj/Localizable.strings b/SoObjects/Appointments/German.lproj/Localizable.strings index dd09f0415..d4b424810 100644 --- a/SoObjects/Appointments/German.lproj/Localizable.strings +++ b/SoObjects/Appointments/German.lproj/Localizable.strings @@ -1 +1,8 @@ "Personal Calendar" = "Persönlicher Kalender"; +vevent_class0 = "(Öffentlicher Termin)"; +vevent_class1 = "(Privater Termin)"; +vevent_class2 = "(Vertraulicher Termin)"; + +vtodo_class0 = "(Öffentliche Aufgabe)"; +vtodo_class1 = "(Private Aufgabe)"; +vtodo_class2 = "(Vertrauliche Aufgabe)"; \ No newline at end of file diff --git a/SoObjects/Appointments/Italian.lproj/Localizable.strings b/SoObjects/Appointments/Italian.lproj/Localizable.strings index 003f167f8..321113ba2 100644 --- a/SoObjects/Appointments/Italian.lproj/Localizable.strings +++ b/SoObjects/Appointments/Italian.lproj/Localizable.strings @@ -1 +1,8 @@ "Personal Calendar" = "Calendario personale"; +vevent_class0 = "(Evento pubblico)"; +vevent_class1 = "(Evento privato)"; +vevent_class2 = "(Evento confidenziale)"; + +vtodo_class0 = "(Attività pubblica)"; +vtodo_class1 = "(Attività privata)"; +vtodo_class2 = "(Attività confidenziale)"; \ No newline at end of file diff --git a/SoObjects/Appointments/SOGoCalendarComponent.m b/SoObjects/Appointments/SOGoCalendarComponent.m index 6f2c2f0b9..de026ee1c 100644 --- a/SoObjects/Appointments/SOGoCalendarComponent.m +++ b/SoObjects/Appointments/SOGoCalendarComponent.m @@ -119,7 +119,21 @@ static BOOL sendEMailNotifications = NO; - (void) _filterComponent: (iCalEntityObject *) component { - [component setSummary: @""]; + NSString *type; + int classification; + + type = @"vtodo"; + classification = 0; + + if ([component isKindOfClass: [iCalEvent class]]) + type = @"vevent"; + + if ([component symbolicAccessClass] == iCalAccessPrivate) + classification = 1; + else if ([component symbolicAccessClass] == iCalAccessPrivate) + classification = 2; + + [component setSummary: [self labelForKey: [NSString stringWithFormat: @"%@_class%d", type, classification]]]; [component setComment: @""]; [component setUserComment: @""]; [component setLocation: @""]; @@ -168,6 +182,11 @@ static BOOL sendEMailNotifications = NO; tmpComponent = (iCalRepeatableEntityObject *) [tmpCalendar firstChildWithTag: [self componentTag]]; [self _filterComponent: tmpComponent]; + + // We add an additional header here to inform clients (if necessary) that + // we churned the content of the calendar. + [tmpComponent addChild: [CardElement simpleElementWithTag: @"X-SOGo-Secure" + value: @"YES"]]; iCalString = [tmpCalendar versitString]; [tmpCalendar release]; } diff --git a/SoObjects/Appointments/Spanish.lproj/Localizable.strings b/SoObjects/Appointments/Spanish.lproj/Localizable.strings index 9c2aabbc3..1d091bd57 100644 --- a/SoObjects/Appointments/Spanish.lproj/Localizable.strings +++ b/SoObjects/Appointments/Spanish.lproj/Localizable.strings @@ -1 +1,8 @@ "Personal Calendar" = "Calendario personal"; +vevent_class0 = "(Evento público)"; +vevent_class1 = "(Evento privado)"; +vevent_class2 = "(Evento confidencial)"; + +vtodo_class0 = "(Tarea pública)"; +vtodo_class1 = "(Tarea privada)"; +vtodo_class2 = "(Tarea confidencial)"; diff --git a/UI/SOGoUI/SOGoAptFormatter.m b/UI/SOGoUI/SOGoAptFormatter.m index 4824f4b4a..3c5c4b54b 100644 --- a/UI/SOGoUI/SOGoAptFormatter.m +++ b/UI/SOGoUI/SOGoAptFormatter.m @@ -1,4 +1,5 @@ /* + Copyright (C) 2008-2009 Inverse inc. Copyright (C) 2004-2005 SKYRIX Software AG This file is part of OpenGroupware.org. diff --git a/UI/Scheduler/UIxCalView.m b/UI/Scheduler/UIxCalView.m index 30ed361d5..917bd5bb0 100644 --- a/UI/Scheduler/UIxCalView.m +++ b/UI/Scheduler/UIxCalView.m @@ -20,8 +20,6 @@ * Boston, MA 02111-1307, USA. */ -//#import - #import #import #import