See ChangeLog
Monotone-Parent: fd17d1db3508a9f1ae745c58c00d732b0459740e Monotone-Revision: 38ed0d2f958b7e2d81b025392abb06c7e4a476b1 Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2008-11-28T20:12:22 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
parent
166213933f
commit
9d4b88dfc7
|
@ -1,3 +1,8 @@
|
||||||
|
2008-11-28 Ludovic Marcotte <lmarcotte@inverse.ca>
|
||||||
|
|
||||||
|
* We no longer show the previous/new location
|
||||||
|
if it's empty in the invitation update templates.
|
||||||
|
|
||||||
2008-11-26 Ludovic Marcotte <lmarcotte@inverse.ca>
|
2008-11-26 Ludovic Marcotte <lmarcotte@inverse.ca>
|
||||||
|
|
||||||
* SoObjects/SOGo/SOGoGCSFolder.m
|
* SoObjects/SOGo/SOGoGCSFolder.m
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<#IsSubject>The appointment "<#Summary />" for the <#OldAptStartDate /> at <#OldAptStartTime /> has changed</#IsSubject>
|
<#IsSubject>The appointment "<#Summary />" for the <#OldAptStartDate /> at <#OldAptStartTime /> has changed</#IsSubject>
|
||||||
<#IsBody>
|
<#IsBody>
|
||||||
This appointment, previously set for <#OldAptStartDate /> at <#OldAptStartTime /> (<#OldAptLocation />) is now scheduled for <#NewAptStartDate /> at <#NewAptStartTime /> (<#NewAptLocation />).
|
This appointment, previously set for <#OldAptStartDate /> at <#OldAptStartTime /><#HasOldLocation> (<#OldAptLocation />)</#HasOldLocation> is now scheduled for <#NewAptStartDate /> at <#NewAptStartTime /><#HasNewLocation> (<#NewAptLocation />)</#HasNewLocation>.
|
||||||
Please make a decision for these new settings.
|
Please make a decision for these new settings.
|
||||||
</#IsBody>
|
</#IsBody>
|
||||||
|
|
|
@ -50,3 +50,11 @@ Summary: WOString {
|
||||||
value = summary;
|
value = summary;
|
||||||
escapeHTML = NO;
|
escapeHTML = NO;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
HasNewLocation: WOConditional {
|
||||||
|
condition = hasNewLocation;
|
||||||
|
}
|
||||||
|
|
||||||
|
HasOldLocation: WOConditional {
|
||||||
|
condition = hasOldLocation;
|
||||||
|
}
|
|
@ -1,5 +1,5 @@
|
||||||
<#IsSubject>The appointment "<#Summary />" for the <#OldAptStartDate /> at <#OldAptStartTime /> has changed</#IsSubject>
|
<#IsSubject>The appointment "<#Summary />" for the <#OldAptStartDate /> at <#OldAptStartTime /> has changed</#IsSubject>
|
||||||
<#IsBody>
|
<#IsBody>
|
||||||
This appointment, previously set for <#OldAptStartDate /> at <#OldAptStartTime /> (<#OldAptLocation />) is now scheduled for <#NewAptStartDate /> at <#NewAptStartTime /> (<#NewAptLocation />).
|
This appointment, previously set for <#OldAptStartDate /> at <#OldAptStartTime /><#HasOldLocation> (<#OldAptLocation />)</#HasOldLocation> is now scheduled for <#NewAptStartDate /> at <#NewAptStartTime /><#HasNewLocation> (<#NewAptLocation />)</#HasNewLocation>.
|
||||||
Please make a decision for these new settings.
|
Please make a decision for these new settings.
|
||||||
</#IsBody>
|
</#IsBody>
|
||||||
|
|
|
@ -50,3 +50,11 @@ Summary: WOString {
|
||||||
value = summary;
|
value = summary;
|
||||||
escapeHTML = NO;
|
escapeHTML = NO;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
HasNewLocation: WOConditional {
|
||||||
|
condition = hasNewLocation;
|
||||||
|
}
|
||||||
|
|
||||||
|
HasOldLocation: WOConditional {
|
||||||
|
condition = hasOldLocation;
|
||||||
|
}
|
|
@ -1,5 +1,5 @@
|
||||||
<#IsSubject>Le rendez-vous "<#Summary />" du <#OldAptStartDate /> à <#OldAptStartTime /> est modifié</#IsSubject>
|
<#IsSubject>Le rendez-vous "<#Summary />" du <#OldAptStartDate /> à <#OldAptStartTime /> est modifié</#IsSubject>
|
||||||
<#IsBody>
|
<#IsBody>
|
||||||
La réunion qui devait se dérouler le <#OldAptStartDate /> à <#OldAptStartTime /> (<#OldAptLocation />) est maintenant prévue le <#NewAptStartDate /> à <#NewAptStartTime /> (<#NewAptLocation />).
|
La réunion qui devait se dérouler le <#OldAptStartDate /> à <#OldAptStartTime /><#HasOldLocation> (<#OldAptLocation />)</#HasOldLocation> est maintenant prévue le <#NewAptStartDate /> à <#NewAptStartTime /><#HasNewLocation> (<#NewAptLocation />)</#HasNewLocation>.
|
||||||
Vous êtes invité à accepter ou refuser de participer à la réunion pour cette nouvelle date.
|
Vous êtes invité à accepter ou refuser de participer à la réunion pour cette nouvelle date.
|
||||||
</#IsBody>
|
</#IsBody>
|
||||||
|
|
|
@ -50,3 +50,11 @@ Summary: WOString {
|
||||||
value = summary;
|
value = summary;
|
||||||
escapeHTML = NO;
|
escapeHTML = NO;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
HasNewLocation: WOConditional {
|
||||||
|
condition = hasNewLocation;
|
||||||
|
}
|
||||||
|
|
||||||
|
HasOldLocation: WOConditional {
|
||||||
|
condition = hasOldLocation;
|
||||||
|
}
|
|
@ -1,5 +1,5 @@
|
||||||
<#IsSubject>The appointment "<#Summary />" for the <#OldAptStartDate /> at <#OldAptStartTime /> has changed</#IsSubject>
|
<#IsSubject>The appointment "<#Summary />" for the <#OldAptStartDate /> at <#OldAptStartTime /> has changed</#IsSubject>
|
||||||
<#IsBody>
|
<#IsBody>
|
||||||
This appointment, previously set for <#OldAptStartDate /> at <#OldAptStartTime /> (<#OldAptLocation />) is now scheduled for <#NewAptStartDate /> at <#NewAptStartTime /> (<#NewAptLocation />).
|
This appointment, previously set for <#OldAptStartDate /> at <#OldAptStartTime /><#HasOldLocation> (<#OldAptLocation />)</#HasOldLocation> is now scheduled for <#NewAptStartDate /> at <#NewAptStartTime /><#HasNewLocation> (<#NewAptLocation />)</#HasNewLocation>.
|
||||||
Please make a decision for these new settings.
|
Please make a decision for these new settings.
|
||||||
</#IsBody>
|
</#IsBody>
|
||||||
|
|
|
@ -50,3 +50,11 @@ Summary: WOString {
|
||||||
value = summary;
|
value = summary;
|
||||||
escapeHTML = NO;
|
escapeHTML = NO;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
HasNewLocation: WOConditional {
|
||||||
|
condition = hasNewLocation;
|
||||||
|
}
|
||||||
|
|
||||||
|
HasOldLocation: WOConditional {
|
||||||
|
condition = hasOldLocation;
|
||||||
|
}
|
|
@ -1,8 +1,5 @@
|
||||||
<#IsSubject>L'appuntamento "<#Summary />" fissato in data <#OldAptStartDate /> alle ore <#OldAptStartTime /> è stato modificato </#IsSubject>
|
<#IsSubject>L'appuntamento "<#Summary />" fissato in data <#OldAptStartDate /> alle ore <#OldAptStartTime /> è stato modificato </#IsSubject>
|
||||||
<#IsBody>
|
<#IsBody>
|
||||||
Questo appuntamento, fissato precedentemete in data <#OldAptStartDate /> (<#OldAptLocation />)
|
Questo appuntamento, fissato precedentemete in data <#OldAptStartDate /><#HasOldLocation> (<#OldAptLocation />)</#HasOldLocation> alle ore <#OldAptStartTime /> è ora programmato il <#NewAptStartDate /> alle ore <#NewAptStartTime/><#HasNewLocation> (<#NewAptLocation />)</#HasNewLocation>.
|
||||||
alle ore <#OldAptStartTime /> è ora programmato il <#NewAptStartDate
|
|
||||||
/> alle ore <#NewAptStartTime
|
|
||||||
/> (<#NewAptLocation />)
|
|
||||||
Per confermare o disdire.
|
Per confermare o disdire.
|
||||||
</#IsBody>
|
</#IsBody>
|
||||||
|
|
|
@ -50,3 +50,11 @@ Summary: WOString {
|
||||||
value = summary;
|
value = summary;
|
||||||
escapeHTML = NO;
|
escapeHTML = NO;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
HasNewLocation: WOConditional {
|
||||||
|
condition = hasNewLocation;
|
||||||
|
}
|
||||||
|
|
||||||
|
HasOldLocation: WOConditional {
|
||||||
|
condition = hasOldLocation;
|
||||||
|
}
|
||||||
|
|
|
@ -96,6 +96,16 @@ static NSTimeZone *UTC = nil;
|
||||||
ASSIGN(previousApt, theApt);
|
ASSIGN(previousApt, theApt);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (BOOL) hasNewLocation
|
||||||
|
{
|
||||||
|
return ([[apt location] length] > 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
- (BOOL) hasOldLocation
|
||||||
|
{
|
||||||
|
return ([[previousApt location] length] > 0);
|
||||||
|
}
|
||||||
|
|
||||||
- (NSTimeZone *) viewTZ
|
- (NSTimeZone *) viewTZ
|
||||||
{
|
{
|
||||||
if (self->viewTZ) return self->viewTZ;
|
if (self->viewTZ) return self->viewTZ;
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<#IsSubject>The appointment "<#Summary />" for the <#OldAptStartDate /> at <#OldAptStartTime /> has changed</#IsSubject>
|
<#IsSubject>The appointment "<#Summary />" for the <#OldAptStartDate /> at <#OldAptStartTime /> has changed</#IsSubject>
|
||||||
<#IsBody>
|
<#IsBody>
|
||||||
This appointment, previously set for <#OldAptStartDate /> at <#OldAptStartTime /> (<#OldAptLocation />) is now scheduled for <#NewAptStartDate /> at <#NewAptStartTime /> (<#NewAptLocation />).
|
This appointment, previously set for <#OldAptStartDate /> at <#OldAptStartTime /><#HasOldLocation> (<#OldAptLocation />)</#HasOldLocation> is now scheduled for <#NewAptStartDate /> at <#NewAptStartTime /><#HasNewLocation> (<#NewAptLocation />)</#HasNewLocation>.
|
||||||
Please make a decision for these new settings.
|
Please make a decision for these new settings.
|
||||||
</#IsBody>
|
</#IsBody>
|
||||||
|
|
|
@ -50,3 +50,11 @@ Summary: WOString {
|
||||||
value = summary;
|
value = summary;
|
||||||
escapeHTML = NO;
|
escapeHTML = NO;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
HasNewLocation: WOConditional {
|
||||||
|
condition = hasNewLocation;
|
||||||
|
}
|
||||||
|
|
||||||
|
HasOldLocation: WOConditional {
|
||||||
|
condition = hasOldLocation;
|
||||||
|
}
|
Loading…
Reference in a new issue