From acc0494eb767b7adc680e197d07ac02741d61540 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Sun, 21 Dec 2008 17:15:47 +0000 Subject: [PATCH] See ChangeLog Monotone-Parent: 85bab6959b5681b31089aa2b3aec261a5e8b505f Monotone-Revision: ea2c63ea9ee832faefb0e8af2802daf075d7b335 Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2008-12-21T17:15:47 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 5 +++++ .../SOGoAptMailDutchUpdate.html | 2 +- .../SOGoAptMailDutchUpdate.wo/SOGoAptMailDutchUpdate.wod | 9 +++++++++ .../SOGoAptMailEnglishUpdate.html | 2 +- .../SOGoAptMailEnglishUpdate.wod | 9 +++++++++ .../SOGoAptMailFrenchUpdate.html | 2 +- .../SOGoAptMailFrenchUpdate.wod | 9 +++++++++ .../SOGoAptMailGermanUpdate.html | 2 +- .../SOGoAptMailGermanUpdate.wod | 9 +++++++++ .../SOGoAptMailItalianUpdate.html | 2 +- .../SOGoAptMailItalianUpdate.wod | 9 +++++++++ .../SOGoAptMailSpanishUpdate.html | 2 +- .../SOGoAptMailSpanishUpdate.wod | 9 +++++++++ 13 files changed, 65 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index ac27d2ad8..018d59cea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-12-21 Ludovic Marcotte + + * Added the "sent-by" field to all invitation + update templates. + 2008-12-19 Francis Lachapelle * iCalWeeklyRecurrenceCalculator.m ([iCalDailyRecurrenceCalculator diff --git a/SoObjects/Appointments/SOGoAptMailDutchUpdate.wo/SOGoAptMailDutchUpdate.html b/SoObjects/Appointments/SOGoAptMailDutchUpdate.wo/SOGoAptMailDutchUpdate.html index 07e0563a4..ade9f7f44 100644 --- a/SoObjects/Appointments/SOGoAptMailDutchUpdate.wo/SOGoAptMailDutchUpdate.html +++ b/SoObjects/Appointments/SOGoAptMailDutchUpdate.wo/SOGoAptMailDutchUpdate.html @@ -1,5 +1,5 @@ <#IsSubject>The appointment "<#Summary />" for the <#OldAptStartDate /> at <#OldAptStartTime /> has changed <#IsBody> -This appointment, previously set for <#OldAptStartDate /> at <#OldAptStartTime /><#HasOldLocation> (<#OldAptLocation />) is now scheduled for <#NewAptStartDate /> at <#NewAptStartTime /><#HasNewLocation> (<#NewAptLocation />). +This appointment<#HasSentBy> (sent by <#sentBy/>), previously set for <#OldAptStartDate /> at <#OldAptStartTime /><#HasOldLocation> (<#OldAptLocation />) is now scheduled for <#NewAptStartDate /> at <#NewAptStartTime /><#HasNewLocation> (<#NewAptLocation />). Please make a decision for these new settings. diff --git a/SoObjects/Appointments/SOGoAptMailDutchUpdate.wo/SOGoAptMailDutchUpdate.wod b/SoObjects/Appointments/SOGoAptMailDutchUpdate.wo/SOGoAptMailDutchUpdate.wod index 7d91b228a..65021fc5a 100644 --- a/SoObjects/Appointments/SOGoAptMailDutchUpdate.wo/SOGoAptMailDutchUpdate.wod +++ b/SoObjects/Appointments/SOGoAptMailDutchUpdate.wo/SOGoAptMailDutchUpdate.wod @@ -57,4 +57,13 @@ HasNewLocation: WOConditional { HasOldLocation: WOConditional { condition = hasOldLocation; +} + +HasSentBy: WOConditional { + condition = hasSentBy; +} + +sentBy: WOString { + value = sentBy; + escapeHTML = NO; } \ No newline at end of file diff --git a/SoObjects/Appointments/SOGoAptMailEnglishUpdate.wo/SOGoAptMailEnglishUpdate.html b/SoObjects/Appointments/SOGoAptMailEnglishUpdate.wo/SOGoAptMailEnglishUpdate.html index 07e0563a4..ade9f7f44 100644 --- a/SoObjects/Appointments/SOGoAptMailEnglishUpdate.wo/SOGoAptMailEnglishUpdate.html +++ b/SoObjects/Appointments/SOGoAptMailEnglishUpdate.wo/SOGoAptMailEnglishUpdate.html @@ -1,5 +1,5 @@ <#IsSubject>The appointment "<#Summary />" for the <#OldAptStartDate /> at <#OldAptStartTime /> has changed <#IsBody> -This appointment, previously set for <#OldAptStartDate /> at <#OldAptStartTime /><#HasOldLocation> (<#OldAptLocation />) is now scheduled for <#NewAptStartDate /> at <#NewAptStartTime /><#HasNewLocation> (<#NewAptLocation />). +This appointment<#HasSentBy> (sent by <#sentBy/>), previously set for <#OldAptStartDate /> at <#OldAptStartTime /><#HasOldLocation> (<#OldAptLocation />) is now scheduled for <#NewAptStartDate /> at <#NewAptStartTime /><#HasNewLocation> (<#NewAptLocation />). Please make a decision for these new settings. diff --git a/SoObjects/Appointments/SOGoAptMailEnglishUpdate.wo/SOGoAptMailEnglishUpdate.wod b/SoObjects/Appointments/SOGoAptMailEnglishUpdate.wo/SOGoAptMailEnglishUpdate.wod index 7d91b228a..65021fc5a 100644 --- a/SoObjects/Appointments/SOGoAptMailEnglishUpdate.wo/SOGoAptMailEnglishUpdate.wod +++ b/SoObjects/Appointments/SOGoAptMailEnglishUpdate.wo/SOGoAptMailEnglishUpdate.wod @@ -57,4 +57,13 @@ HasNewLocation: WOConditional { HasOldLocation: WOConditional { condition = hasOldLocation; +} + +HasSentBy: WOConditional { + condition = hasSentBy; +} + +sentBy: WOString { + value = sentBy; + escapeHTML = NO; } \ No newline at end of file diff --git a/SoObjects/Appointments/SOGoAptMailFrenchUpdate.wo/SOGoAptMailFrenchUpdate.html b/SoObjects/Appointments/SOGoAptMailFrenchUpdate.wo/SOGoAptMailFrenchUpdate.html index 1b9168190..d746a6fdd 100644 --- a/SoObjects/Appointments/SOGoAptMailFrenchUpdate.wo/SOGoAptMailFrenchUpdate.html +++ b/SoObjects/Appointments/SOGoAptMailFrenchUpdate.wo/SOGoAptMailFrenchUpdate.html @@ -1,5 +1,5 @@ <#IsSubject>Le rendez-vous "<#Summary />" du <#OldAptStartDate /> à <#OldAptStartTime /> est modifié <#IsBody> -La réunion qui devait se dérouler le <#OldAptStartDate /> à <#OldAptStartTime /><#HasOldLocation> (<#OldAptLocation />) est maintenant prévue le <#NewAptStartDate /> à <#NewAptStartTime /><#HasNewLocation> (<#NewAptLocation />). +La réunion<#HasSentBy> (envoyé par <#sentBy/>) qui devait se dérouler le <#OldAptStartDate /> à <#OldAptStartTime /><#HasOldLocation> (<#OldAptLocation />) est maintenant prévue le <#NewAptStartDate /> à <#NewAptStartTime /><#HasNewLocation> (<#NewAptLocation />). Vous êtes invité à accepter ou refuser de participer à la réunion pour cette nouvelle date. diff --git a/SoObjects/Appointments/SOGoAptMailFrenchUpdate.wo/SOGoAptMailFrenchUpdate.wod b/SoObjects/Appointments/SOGoAptMailFrenchUpdate.wo/SOGoAptMailFrenchUpdate.wod index 7d91b228a..65021fc5a 100644 --- a/SoObjects/Appointments/SOGoAptMailFrenchUpdate.wo/SOGoAptMailFrenchUpdate.wod +++ b/SoObjects/Appointments/SOGoAptMailFrenchUpdate.wo/SOGoAptMailFrenchUpdate.wod @@ -57,4 +57,13 @@ HasNewLocation: WOConditional { HasOldLocation: WOConditional { condition = hasOldLocation; +} + +HasSentBy: WOConditional { + condition = hasSentBy; +} + +sentBy: WOString { + value = sentBy; + escapeHTML = NO; } \ No newline at end of file diff --git a/SoObjects/Appointments/SOGoAptMailGermanUpdate.wo/SOGoAptMailGermanUpdate.html b/SoObjects/Appointments/SOGoAptMailGermanUpdate.wo/SOGoAptMailGermanUpdate.html index b9ab43329..a1fe49195 100644 --- a/SoObjects/Appointments/SOGoAptMailGermanUpdate.wo/SOGoAptMailGermanUpdate.html +++ b/SoObjects/Appointments/SOGoAptMailGermanUpdate.wo/SOGoAptMailGermanUpdate.html @@ -1,5 +1,5 @@ <#IsSubject>Der Termin "<#Summary />" am <#OldAptStartDate /> um <#OldAptStartTime /> hat sich geändert <#IsBody> -Dieser Termin, ursprünglich geplant am <#OldAptStartDate /> um <#OldAptStartTime /><#HasOldLocation> (<#OldAptLocation />), ist nun verschoben auf den <#NewAptStartDate /> um <#NewAptStartTime /><#HasNewLocation> (<#NewAptLocation />). +Dieser Termin <#HasSentBy>(sent by <#sentBy/>), ursprünglich geplant am <#OldAptStartDate /> um <#OldAptStartTime /><#HasOldLocation> (<#OldAptLocation />), ist nun verschoben auf den <#NewAptStartDate /> um <#NewAptStartTime /><#HasNewLocation> (<#NewAptLocation />). Bitte treffen Sie eine Entscheidung über diese Änderung. diff --git a/SoObjects/Appointments/SOGoAptMailGermanUpdate.wo/SOGoAptMailGermanUpdate.wod b/SoObjects/Appointments/SOGoAptMailGermanUpdate.wo/SOGoAptMailGermanUpdate.wod index 7d91b228a..65021fc5a 100644 --- a/SoObjects/Appointments/SOGoAptMailGermanUpdate.wo/SOGoAptMailGermanUpdate.wod +++ b/SoObjects/Appointments/SOGoAptMailGermanUpdate.wo/SOGoAptMailGermanUpdate.wod @@ -57,4 +57,13 @@ HasNewLocation: WOConditional { HasOldLocation: WOConditional { condition = hasOldLocation; +} + +HasSentBy: WOConditional { + condition = hasSentBy; +} + +sentBy: WOString { + value = sentBy; + escapeHTML = NO; } \ No newline at end of file diff --git a/SoObjects/Appointments/SOGoAptMailItalianUpdate.wo/SOGoAptMailItalianUpdate.html b/SoObjects/Appointments/SOGoAptMailItalianUpdate.wo/SOGoAptMailItalianUpdate.html index c6dc9a58c..a36e94a2b 100644 --- a/SoObjects/Appointments/SOGoAptMailItalianUpdate.wo/SOGoAptMailItalianUpdate.html +++ b/SoObjects/Appointments/SOGoAptMailItalianUpdate.wo/SOGoAptMailItalianUpdate.html @@ -1,5 +1,5 @@ <#IsSubject>L'appuntamento "<#Summary />" fissato in data <#OldAptStartDate /> alle ore <#OldAptStartTime /> è stato modificato <#IsBody> -Questo appuntamento, fissato precedentemete in data <#OldAptStartDate /><#HasOldLocation> (<#OldAptLocation />) alle ore <#OldAptStartTime /> è ora programmato il <#NewAptStartDate /> alle ore <#NewAptStartTime/><#HasNewLocation> (<#NewAptLocation />). +Questo appuntamento<#HasSentBy> (sent by <#sentBy/>), fissato precedentemete in data <#OldAptStartDate /><#HasOldLocation> (<#OldAptLocation />) alle ore <#OldAptStartTime /> è ora programmato il <#NewAptStartDate /> alle ore <#NewAptStartTime/><#HasNewLocation> (<#NewAptLocation />). Per confermare o disdire. diff --git a/SoObjects/Appointments/SOGoAptMailItalianUpdate.wo/SOGoAptMailItalianUpdate.wod b/SoObjects/Appointments/SOGoAptMailItalianUpdate.wo/SOGoAptMailItalianUpdate.wod index d5a659fa6..65021fc5a 100644 --- a/SoObjects/Appointments/SOGoAptMailItalianUpdate.wo/SOGoAptMailItalianUpdate.wod +++ b/SoObjects/Appointments/SOGoAptMailItalianUpdate.wo/SOGoAptMailItalianUpdate.wod @@ -58,3 +58,12 @@ HasNewLocation: WOConditional { HasOldLocation: WOConditional { condition = hasOldLocation; } + +HasSentBy: WOConditional { + condition = hasSentBy; +} + +sentBy: WOString { + value = sentBy; + escapeHTML = NO; +} \ No newline at end of file diff --git a/SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.html b/SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.html index 07e0563a4..ade9f7f44 100644 --- a/SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.html +++ b/SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.html @@ -1,5 +1,5 @@ <#IsSubject>The appointment "<#Summary />" for the <#OldAptStartDate /> at <#OldAptStartTime /> has changed <#IsBody> -This appointment, previously set for <#OldAptStartDate /> at <#OldAptStartTime /><#HasOldLocation> (<#OldAptLocation />) is now scheduled for <#NewAptStartDate /> at <#NewAptStartTime /><#HasNewLocation> (<#NewAptLocation />). +This appointment<#HasSentBy> (sent by <#sentBy/>), previously set for <#OldAptStartDate /> at <#OldAptStartTime /><#HasOldLocation> (<#OldAptLocation />) is now scheduled for <#NewAptStartDate /> at <#NewAptStartTime /><#HasNewLocation> (<#NewAptLocation />). Please make a decision for these new settings. diff --git a/SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.wod b/SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.wod index 7d91b228a..65021fc5a 100644 --- a/SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.wod +++ b/SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.wod @@ -57,4 +57,13 @@ HasNewLocation: WOConditional { HasOldLocation: WOConditional { condition = hasOldLocation; +} + +HasSentBy: WOConditional { + condition = hasSentBy; +} + +sentBy: WOString { + value = sentBy; + escapeHTML = NO; } \ No newline at end of file