From 9c52c3ad43b4e2a9fc23e8ff654fb7531047e1d8 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 30 May 2007 20:09:34 +0000 Subject: [PATCH] Monotone-Parent: 9e848e008df99a6aae6401a0b3345b1320d222a8 Monotone-Revision: d0c1f09949ba21d2129a3cae67910167e0f0b6a1 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-05-30T20:09:34 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ SoObjects/Appointments/SOGoCalendarComponent.m | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7f46fd92c..60a8bfaf8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2007-05-30 Wolfgang Sourdeau + * SoObjects/Appointments/SOGoCalendarComponent.m + ([SOGoCalendarComponent +initialize]): the default language for + mail templates is now set to English. + * UI/SOGoUI/SOGoACLFrenchRemovalAdvisory.[hm]: new subclass of SOGoACLAdvisory implementing the french template for user removal from acls. diff --git a/SoObjects/Appointments/SOGoCalendarComponent.m b/SoObjects/Appointments/SOGoCalendarComponent.m index 39b3d1afe..e6a6a65c3 100644 --- a/SoObjects/Appointments/SOGoCalendarComponent.m +++ b/SoObjects/Appointments/SOGoCalendarComponent.m @@ -57,7 +57,7 @@ static BOOL sendEMailNotifications = NO; mailTemplateDefaultLanguage = [[ud stringForKey:@"SOGoDefaultLanguage"] retain]; if (!mailTemplateDefaultLanguage) - mailTemplateDefaultLanguage = @"French"; + mailTemplateDefaultLanguage = @"English"; sendEMailNotifications = [ud boolForKey: @"SOGoAppointmentSendEMailNotifications"]; @@ -377,6 +377,8 @@ static BOOL sendEMailNotifications = NO; else recipient = email; +#warning this could be optimized in a class hierarchy common with the \ + SOGoObject's acl notification mechanism /* create page name */ // TODO: select user's default language? pageName = [NSString stringWithFormat: @"SOGoAptMail%@%@",