From 7c25c16ddb9d70ad540b13d54cdf8b49d49e1710 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Thu, 9 Jul 2009 14:55:16 +0000 Subject: [PATCH] Removed extra space in invitation reply template Monotone-Parent: 41c1c5726230c10d450e8d6282dda4a8d0ce1de3 Monotone-Revision: f6c80d5cb25bb1c9887983399ad7fa9954631ac1 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2009-07-09T14:55:16 Monotone-Branch: ca.inverse.sogo --- .../SOGoAptMailDutchICalReply.html | 2 +- .../SOGoAptMailEnglishICalReply.html | 2 +- .../SOGoAptMailFrenchICalReply.html | 2 +- .../SOGoAptMailGermanICalReply.html | 2 +- .../SOGoAptMailItalianICalReply.html | 2 +- .../SOGoAptMailRussianICalReply.html | 2 +- .../SOGoAptMailSpanishICalReply.html | 2 +- .../SOGoAptMailWelshICalReply.html | 3 ++- SoObjects/Appointments/SOGoCalendarComponent.m | 3 ++- 9 files changed, 11 insertions(+), 9 deletions(-) diff --git a/SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.html b/SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.html index 8cb7ba49e..48959a4cf 100644 --- a/SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.html +++ b/SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.html @@ -1,2 +1,2 @@ <#IsSubject>Antwoord voor de gebeurtenisuitnodiging: <#summary/> -<#IsBody><#organizer/><#HasSentBy>(sent by <#sentBy/>) heeft uw uitnodiging voor de gebeurtenis <#HasAccepted>geaccepteerd<#HasDeclined>geweigerd<#HasNotAcceptedNotDeclined>not yet decided upon. +<#IsBody><#organizer/><#HasSentBy> (sent by <#sentBy/>) heeft uw uitnodiging voor de gebeurtenis <#HasAccepted>geaccepteerd<#HasDeclined>geweigerd<#HasNotAcceptedNotDeclined>not yet decided upon. diff --git a/SoObjects/Appointments/SOGoAptMailEnglishICalReply.wo/SOGoAptMailEnglishICalReply.html b/SoObjects/Appointments/SOGoAptMailEnglishICalReply.wo/SOGoAptMailEnglishICalReply.html index 4d9397882..59689fc15 100644 --- a/SoObjects/Appointments/SOGoAptMailEnglishICalReply.wo/SOGoAptMailEnglishICalReply.html +++ b/SoObjects/Appointments/SOGoAptMailEnglishICalReply.wo/SOGoAptMailEnglishICalReply.html @@ -1,2 +1,2 @@ <#IsSubject>Event Invitation Reply: <#summary/> -<#IsBody><#attendee/> has <#HasSentBy>(sent by <#sentBy/>) <#HasAccepted>accepted<#HasDeclined>declined<#HasNotAcceptedNotDeclined>not yet decided upon your event invitation. +<#IsBody><#attendee/><#HasSentBy> (sent by <#sentBy/>) has <#HasAccepted>accepted<#HasDeclined>declined<#HasNotAcceptedNotDeclined>not yet decided upon your event invitation. diff --git a/SoObjects/Appointments/SOGoAptMailFrenchICalReply.wo/SOGoAptMailFrenchICalReply.html b/SoObjects/Appointments/SOGoAptMailFrenchICalReply.wo/SOGoAptMailFrenchICalReply.html index e83939934..fe5c4ff95 100644 --- a/SoObjects/Appointments/SOGoAptMailFrenchICalReply.wo/SOGoAptMailFrenchICalReply.html +++ b/SoObjects/Appointments/SOGoAptMailFrenchICalReply.wo/SOGoAptMailFrenchICalReply.html @@ -1,2 +1,2 @@ <#IsSubject>Réponse à l'invitation : «<#summary/>» -<#IsBody><#attendee/> <#HasSentBy>(envoyé par <#sentBy/>) a <#HasAccepted>accepté<#HasDeclined>refusé<#HasNotAcceptedNotDeclined>choisi de reporter sa décision par rapport à votre invitation. +<#IsBody><#attendee/><#HasSentBy> (envoyé par <#sentBy/>) a <#HasAccepted>accepté<#HasDeclined>refusé<#HasNotAcceptedNotDeclined>choisi de reporter sa décision par rapport à votre invitation. diff --git a/SoObjects/Appointments/SOGoAptMailGermanICalReply.wo/SOGoAptMailGermanICalReply.html b/SoObjects/Appointments/SOGoAptMailGermanICalReply.wo/SOGoAptMailGermanICalReply.html index c77bde869..b008ad29c 100644 --- a/SoObjects/Appointments/SOGoAptMailGermanICalReply.wo/SOGoAptMailGermanICalReply.html +++ b/SoObjects/Appointments/SOGoAptMailGermanICalReply.wo/SOGoAptMailGermanICalReply.html @@ -1,2 +1,2 @@ <#IsSubject>Antwort Termineinladung: <#summary/> -<#IsBody><#attendee/><#HasSentBy>(sent by <#sentBy/>) hat <#HasAccepted>Ihre Termineinladung akzeptiert<#HasDeclined>Ihre Termineinladung abgelehnt<#HasNotAcceptedNotDeclined>noch nicht über Ihre Termineinladung entschieden. +<#IsBody><#attendee/><#HasSentBy> (sent by <#sentBy/>) hat <#HasAccepted>Ihre Termineinladung akzeptiert<#HasDeclined>Ihre Termineinladung abgelehnt<#HasNotAcceptedNotDeclined>noch nicht über Ihre Termineinladung entschieden. diff --git a/SoObjects/Appointments/SOGoAptMailItalianICalReply.wo/SOGoAptMailItalianICalReply.html b/SoObjects/Appointments/SOGoAptMailItalianICalReply.wo/SOGoAptMailItalianICalReply.html index 68a9774e6..3365b2211 100644 --- a/SoObjects/Appointments/SOGoAptMailItalianICalReply.wo/SOGoAptMailItalianICalReply.html +++ b/SoObjects/Appointments/SOGoAptMailItalianICalReply.wo/SOGoAptMailItalianICalReply.html @@ -1,2 +1,2 @@ <#IsSubject>Re: Appuntemento : "<#summary/>" -<#IsBody><#attendee/><#HasSentBy>(sent by <#sentBy/>) ha <#HasAccepted>accettato<#HasDeclined>declinato<#HasNotAcceptedNotDeclined>not yet decided upon l'invito al proprio evento. +<#IsBody><#attendee/><#HasSentBy> (sent by <#sentBy/>) ha <#HasAccepted>accettato<#HasDeclined>declinato<#HasNotAcceptedNotDeclined>not yet decided upon l'invito al proprio evento. diff --git a/SoObjects/Appointments/SOGoAptMailRussianICalReply.wo/SOGoAptMailRussianICalReply.html b/SoObjects/Appointments/SOGoAptMailRussianICalReply.wo/SOGoAptMailRussianICalReply.html index cb3ee63c0..6d17b327c 100644 --- a/SoObjects/Appointments/SOGoAptMailRussianICalReply.wo/SOGoAptMailRussianICalReply.html +++ b/SoObjects/Appointments/SOGoAptMailRussianICalReply.wo/SOGoAptMailRussianICalReply.html @@ -1,2 +1,2 @@ <#IsSubject>Ответ на приглашение: <#summary/> -<#IsBody><#attendee/> <#HasSentBy>(послал <#sentBy/>) <#HasAccepted>согласился<#HasDeclined>отказался<#HasNotAcceptedNotDeclined>не определился с желанием участвовать в запланированном мероприятии. +<#IsBody><#attendee/><#HasSentBy> (послал <#sentBy/>) <#HasAccepted>согласился<#HasDeclined>отказался<#HasNotAcceptedNotDeclined>не определился с желанием участвовать в запланированном мероприятии. diff --git a/SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.html b/SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.html index 6f82c321c..76ac36766 100644 --- a/SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.html +++ b/SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.html @@ -1,2 +1,2 @@ <#IsSubject>Respuesta a la invitación al evento: <#summary/> -<#IsBody><#attendee/><#HasSentBy>(sent by <#sentBy/>) ha <#HasAccepted>aceptado<#HasDelined>rechazado<#HasNotAcceptedNotDeclined>not yet decided upon su invitación al evento. +<#IsBody><#attendee/><#HasSentBy> (sent by <#sentBy/>) ha <#HasAccepted>aceptado<#HasDelined>rechazado<#HasNotAcceptedNotDeclined>not yet decided upon su invitación al evento. diff --git a/SoObjects/Appointments/SOGoAptMailWelshICalReply.wo/SOGoAptMailWelshICalReply.html b/SoObjects/Appointments/SOGoAptMailWelshICalReply.wo/SOGoAptMailWelshICalReply.html index e2738f373..c3ce52e64 100644 --- a/SoObjects/Appointments/SOGoAptMailWelshICalReply.wo/SOGoAptMailWelshICalReply.html +++ b/SoObjects/Appointments/SOGoAptMailWelshICalReply.wo/SOGoAptMailWelshICalReply.html @@ -1 +1,2 @@ -<#IsSubject>Ymateb i wahoddiad: <#summary/> <#IsBody><#attendee/> wedi <#HasSentBy>(anfon gan <#sentBy/>) <#HasAccepted>wedi derbyn<#HasDeclined>wedi gwrthod<#HasNotAcceptedNotDeclined>heb benderfynu ar eich gwahoddiad eto. \ No newline at end of file +<#IsSubject>Ymateb i wahoddiad: <#summary/> +<#IsBody><#attendee/><#HasSentBy> (anfon gan <#sentBy/>) wedi <#HasAccepted>wedi derbyn<#HasDeclined>wedi gwrthod<#HasNotAcceptedNotDeclined>heb benderfynu ar eich gwahoddiad eto. diff --git a/SoObjects/Appointments/SOGoCalendarComponent.m b/SoObjects/Appointments/SOGoCalendarComponent.m index 80fe0393e..4e627ef62 100644 --- a/SoObjects/Appointments/SOGoCalendarComponent.m +++ b/SoObjects/Appointments/SOGoCalendarComponent.m @@ -661,7 +661,8 @@ static inline BOOL _occurenceHasID (iCalRepeatableEntityObject *occurence, NSStr subject = [p getSubject]; text = [p getBody]; NSLog(@"Template: %@", pageName); - NSLog(@"Sender => Recipient: %@ => %@", senderEmail, recipient); + NSLog(@"Sender: %@", senderEmail); + NSLog(@"Recipient: %@", recipient); NSLog(@"Subject: %@", subject); /* construct message */