LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge of '198fe6947014072d94cf42fd01ddad350fa6bd08' 

and 'f6c80d5cb25bb1c9887983399ad7fa9954631ac1'

Monotone-Parent: 198fe6947014072d94cf42fd01ddad350fa6bd08
Monotone-Parent: f6c80d5cb25bb1c9887983399ad7fa9954631ac1
Monotone-Revision: 130245b7479c6dceb4d9ebbf839fbab430101735

Monotone-Author: crobert@inverse.ca
Monotone-Date: 2009-07-09T15:44:36
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
C Robert 2009-07-09 15:44:36 +00:00
parent 9cf72ec8d5 7c25c16ddb
commit 4cfe7e417c
10 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.html
View File

@ -1,2 +1,2 @@
<#IsSubject>Antwoord voor de gebeurtenisuitnodiging: <#summary/></#IsSubject>
<#IsBody><#organizer/><#HasSentBy>(sent by <#sentBy/>) </#HasSentBy> heeft uw uitnodiging voor de gebeurtenis <#HasAccepted>geaccepteerd</#HasAccepted><#HasDeclined>geweigerd</#HasDeclined><#HasNotAcceptedNotDeclined>not yet decided upon</#HasNotAcceptedNotDeclined>.</#IsBody>
<#IsBody><#organizer/><#HasSentBy> (sent by <#sentBy/>)</#HasSentBy> heeft uw uitnodiging voor de gebeurtenis <#HasAccepted>geaccepteerd</#HasAccepted><#HasDeclined>geweigerd</#HasDeclined><#HasNotAcceptedNotDeclined>not yet decided upon</#HasNotAcceptedNotDeclined>.</#IsBody>

2
SoObjects/Appointments/SOGoAptMailEnglishICalReply.wo/SOGoAptMailEnglishICalReply.html
View File

@ -1,2 +1,2 @@
<#IsSubject>Event Invitation Reply: <#summary/></#IsSubject>
<#IsBody><#attendee/> has <#HasSentBy>(sent by <#sentBy/>) </#HasSentBy><#HasAccepted>accepted</#HasAccepted><#HasDeclined>declined</#HasDeclined><#HasNotAcceptedNotDeclined>not yet decided upon</#HasNotAcceptedNotDeclined> your event invitation.</#IsBody>
<#IsBody><#attendee/><#HasSentBy> (sent by <#sentBy/>)</#HasSentBy> has <#HasAccepted>accepted</#HasAccepted><#HasDeclined>declined</#HasDeclined><#HasNotAcceptedNotDeclined>not yet decided upon</#HasNotAcceptedNotDeclined> your event invitation.</#IsBody>

2
SoObjects/Appointments/SOGoAptMailFrenchICalReply.wo/SOGoAptMailFrenchICalReply.html
View File

@ -1,2 +1,2 @@
<#IsSubject>Réponse à l'invitation : «<#summary/>»</#IsSubject>
<#IsBody><#attendee/> <#HasSentBy>(envoyé par <#sentBy/>) </#HasSentBy> a <#HasAccepted>accepté</#HasAccepted><#HasDeclined>refusé</#HasDeclined><#HasNotAcceptedNotDeclined>choisi de reporter sa décision par rapport à</#HasNotAcceptedNotDeclined> votre invitation.</#IsBody>
<#IsBody><#attendee/><#HasSentBy> (envoyé par <#sentBy/>)</#HasSentBy> a <#HasAccepted>accepté</#HasAccepted><#HasDeclined>refusé</#HasDeclined><#HasNotAcceptedNotDeclined>choisi de reporter sa décision par rapport à</#HasNotAcceptedNotDeclined> votre invitation.</#IsBody>

2
SoObjects/Appointments/SOGoAptMailGermanICalReply.wo/SOGoAptMailGermanICalReply.html
View File

@ -1,2 +1,2 @@
<#IsSubject>Antwort Termineinladung: <#summary/></#IsSubject>
<#IsBody><#attendee/><#HasSentBy>(sent by <#sentBy/>) </#HasSentBy> hat <#HasAccepted>Ihre Termineinladung akzeptiert</#HasAccepted><#HasDeclined>Ihre Termineinladung abgelehnt</#HasDeclined><#HasNotAcceptedNotDeclined>noch nicht über Ihre Termineinladung entschieden</#HasNotAcceptedNotDeclined></#IsBody>.
<#IsBody><#attendee/><#HasSentBy> (sent by <#sentBy/>)</#HasSentBy> hat <#HasAccepted>Ihre Termineinladung akzeptiert</#HasAccepted><#HasDeclined>Ihre Termineinladung abgelehnt</#HasDeclined><#HasNotAcceptedNotDeclined>noch nicht über Ihre Termineinladung entschieden</#HasNotAcceptedNotDeclined></#IsBody>.

2
SoObjects/Appointments/SOGoAptMailItalianICalReply.wo/SOGoAptMailItalianICalReply.html
View File

@ -1,2 +1,2 @@
<#IsSubject>Re: Appuntemento : "<#summary/>"</#IsSubject>
<#IsBody><#attendee/><#HasSentBy>(sent by <#sentBy/>) </#HasSentBy> ha <#HasAccepted>accettato</#HasAccepted><#HasDeclined>declinato</#HasDeclined><#HasNotAcceptedNotDeclined>not yet decided upon</#HasNotAcceptedNotDeclined> l'invito al proprio evento.</#IsBody>
<#IsBody><#attendee/><#HasSentBy> (sent by <#sentBy/>)</#HasSentBy> ha <#HasAccepted>accettato</#HasAccepted><#HasDeclined>declinato</#HasDeclined><#HasNotAcceptedNotDeclined>not yet decided upon</#HasNotAcceptedNotDeclined> l'invito al proprio evento.</#IsBody>

2
SoObjects/Appointments/SOGoAptMailRussianICalReply.wo/SOGoAptMailRussianICalReply.html
View File

@ -1,2 +1,2 @@
<#IsSubject>Ответ на приглашение: <#summary/></#IsSubject>
<#IsBody><#attendee/> <#HasSentBy>(послал <#sentBy/>) </#HasSentBy><#HasAccepted>согласился</#HasAccepted><#HasDeclined>отказался</#HasDeclined><#HasNotAcceptedNotDeclined>не определился с желанием</#HasNotAcceptedNotDeclined> участвовать в запланированном мероприятии.</#IsBody>
<#IsBody><#attendee/><#HasSentBy> (послал <#sentBy/>)</#HasSentBy> <#HasAccepted>согласился</#HasAccepted><#HasDeclined>отказался</#HasDeclined><#HasNotAcceptedNotDeclined>не определился с желанием</#HasNotAcceptedNotDeclined> участвовать в запланированном мероприятии.</#IsBody>

2
SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.html
View File

@ -1,2 +1,2 @@
<#IsSubject>Respuesta a la invitación al evento: <#summary/></#IsSubject>
<#IsBody><#attendee/><#HasSentBy>(sent by <#sentBy/>) </#HasSentBy> ha <#HasAccepted>aceptado</#HasAccepted><#HasDelined>rechazado</#HasDeclined><#HasNotAcceptedNotDeclined>not yet decided upon</#HasNotAcceptedNotDeclined> su invitación al evento.</#IsBody>
<#IsBody><#attendee/><#HasSentBy> (sent by <#sentBy/>)</#HasSentBy> ha <#HasAccepted>aceptado</#HasAccepted><#HasDelined>rechazado</#HasDeclined><#HasNotAcceptedNotDeclined>not yet decided upon</#HasNotAcceptedNotDeclined> su invitación al evento.</#IsBody>

3
SoObjects/Appointments/SOGoAptMailWelshICalReply.wo/SOGoAptMailWelshICalReply.html
View File

@ -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.
<#IsSubject>Ymateb i wahoddiad: <#summary/></#IsSubject>
<#IsBody><#attendee/><#HasSentBy> (anfon gan <#sentBy/>)</#HasSentBy> wedi <#HasAccepted>wedi derbyn</#HasAccepted><#HasDeclined>wedi gwrthod</#HasDeclined><#HasNotAcceptedNotDeclined>heb benderfynu ar eich gwahoddiad eto</#HasNotAcceptedNotDeclined>.</#IsBody>

3
SoObjects/Appointments/SOGoCalendarComponent.m
View File

@ -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 */

5
UI/WebServerResources/SchedulerUI.js
View File

@ -1814,7 +1814,6 @@ function appendCalendar(folderName, folderPath) {
calendarList.insertBefore(li, items[i]);
else
calendarList.appendChild(li);
$(li).writeAttribute("id", folderPath);
$(li).writeAttribute("owner", owner);
@ -1832,9 +1831,9 @@ function appendCalendar(folderName, folderPath) {
$(colorBox).addClassName("colorBox");
$(colorBox).addClassName('calendarFolder' + folderPath.substr(1));
// Check the checkbox (required for IE)
$(li).down("input.checkBox").checked = true;
li.getElementsByTagName("input")[0].checked = true;
// Register events (doesn't work with Safari)
setEventsOnCalendar($(checkBox), $(li));