merge of 'a19b3dadb613f792f2b5d328cba633f92a37f444'

and 'b9edf052394d895a535d32fccecba31ed057fd61'

Monotone-Parent: a19b3dadb613f792f2b5d328cba633f92a37f444
Monotone-Parent: b9edf052394d895a535d32fccecba31ed057fd61
Monotone-Revision: 162dd535bb3f333402e6c71f49cd3dc84644980c

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-11-29T17:20:54
Monotone-Branch: ca.inverse.sogo

SoObjects/Appointments/SOGoAptMailDutchUpdate.wo/SOGoAptMailDutchUpdate.html

@@ -1,5 +1,5 @@
 <#IsSubject>The appointment "<#Summary />" for the <#OldAptStartDate /> at <#OldAptStartTime /> has changed</#IsSubject>
 <#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.
 </#IsBody>

SoObjects/Appointments/SOGoAptMailDutchUpdate.wo/SOGoAptMailDutchUpdate.wod

@@ -49,4 +49,12 @@ IsBody: WOConditional {
 Summary: WOString {
   value = summary;
   escapeHTML = NO;
+}
+
+HasNewLocation: WOConditional {
+  condition = hasNewLocation;
+}
+
+HasOldLocation: WOConditional {
+  condition = hasOldLocation;
 }

SoObjects/Appointments/SOGoAptMailEnglishUpdate.wo/SOGoAptMailEnglishUpdate.html

@@ -1,5 +1,5 @@
 <#IsSubject>The appointment "<#Summary />" for the <#OldAptStartDate /> at <#OldAptStartTime /> has changed</#IsSubject>
 <#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.
 </#IsBody>

SoObjects/Appointments/SOGoAptMailEnglishUpdate.wo/SOGoAptMailEnglishUpdate.wod

@@ -50,3 +50,11 @@ Summary: WOString {
   value = summary;
   escapeHTML = NO;
 }
+
+HasNewLocation: WOConditional {
+  condition = hasNewLocation;
+}
+
+HasOldLocation: WOConditional {
+  condition = hasOldLocation;
+}

SoObjects/Appointments/SOGoAptMailFrenchUpdate.wo/SOGoAptMailFrenchUpdate.html

@@ -1,5 +1,5 @@
 <#IsSubject>Le rendez-vous "<#Summary />" du <#OldAptStartDate /> à <#OldAptStartTime /> est modifié</#IsSubject>
 <#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.
 </#IsBody>

SoObjects/Appointments/SOGoAptMailFrenchUpdate.wo/SOGoAptMailFrenchUpdate.wod

@@ -49,4 +49,12 @@ IsBody: WOConditional {
 Summary: WOString {
   value = summary;
   escapeHTML = NO;
+}
+
+HasNewLocation: WOConditional {
+  condition = hasNewLocation;
+}
+
+HasOldLocation: WOConditional {
+  condition = hasOldLocation;
 }

SoObjects/Appointments/SOGoAptMailGermanUpdate.wo/SOGoAptMailGermanUpdate.html

@@ -1,5 +1,5 @@
 <#IsSubject>The appointment "<#Summary />" for the <#OldAptStartDate /> at <#OldAptStartTime /> has changed</#IsSubject>
 <#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.
 </#IsBody>

SoObjects/Appointments/SOGoAptMailGermanUpdate.wo/SOGoAptMailGermanUpdate.wod

@@ -49,4 +49,12 @@ IsBody: WOConditional {
 Summary: WOString {
   value = summary;
   escapeHTML = NO;
+}
+
+HasNewLocation: WOConditional {
+  condition = hasNewLocation;
+}
+
+HasOldLocation: WOConditional {
+  condition = hasOldLocation;
 }

SoObjects/Appointments/SOGoAptMailItalianUpdate.wo/SOGoAptMailItalianUpdate.html

@@ -1,8 +1,5 @@
 <#IsSubject>L'appuntamento "<#Summary />" fissato in data <#OldAptStartDate /> alle ore <#OldAptStartTime /> &egrave; stato modificato </#IsSubject>
 <#IsBody>
-Questo appuntamento, fissato precedentemete in data <#OldAptStartDate /> (<#OldAptLocation />)
-alle ore <#OldAptStartTime /> &egrave; ora programmato il <#NewAptStartDate
-/> alle ore <#NewAptStartTime
-/> (<#NewAptLocation />)
+Questo appuntamento, fissato precedentemete in data <#OldAptStartDate /><#HasOldLocation> (<#OldAptLocation />)</#HasOldLocation> alle ore <#OldAptStartTime /> &egrave; ora programmato il <#NewAptStartDate /> alle ore <#NewAptStartTime/><#HasNewLocation> (<#NewAptLocation />)</#HasNewLocation>.
 Per confermare o disdire.
 </#IsBody>

SoObjects/Appointments/SOGoAptMailItalianUpdate.wo/SOGoAptMailItalianUpdate.wod

@@ -49,4 +49,12 @@ IsBody: WOConditional {
 Summary: WOString {
   value = summary;
   escapeHTML = NO;
-}
+}
+
+HasNewLocation: WOConditional {
+  condition = hasNewLocation;
+}
+
+HasOldLocation: WOConditional {
+  condition = hasOldLocation;
+}

SoObjects/Appointments/SOGoAptMailNotification.m

@@ -96,6 +96,16 @@ static NSTimeZone *UTC = nil;
   ASSIGN(previousApt, theApt);
 }
 
+- (BOOL) hasNewLocation
+{
+  return ([[apt location] length] > 0);
+}
+
+- (BOOL) hasOldLocation
+{
+  return ([[previousApt location] length] > 0);
+}
+
 - (NSTimeZone *) viewTZ 
 {
   if (self->viewTZ) return self->viewTZ;

SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.html

@@ -1,5 +1,5 @@
 <#IsSubject>The appointment "<#Summary />" for the <#OldAptStartDate /> at <#OldAptStartTime /> has changed</#IsSubject>
 <#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.
 </#IsBody>

SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.wod

@@ -49,4 +49,12 @@ IsBody: WOConditional {
 Summary: WOString {
   value = summary;
   escapeHTML = NO;
+}
+
+HasNewLocation: WOConditional {
+  condition = hasNewLocation;
+}
+
+HasOldLocation: WOConditional {
+  condition = hasOldLocation;
 }

SoObjects/Contacts/German.lproj/Localizable.strings

@@ -1 +1 @@
-"Personal Address Book" = "Persönliches Addressbuch";
+"Personal Address Book" = "Persönliches Adressbuch";