From aecb5acd2958512b7f684fa8331edaa6a684766e Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 8 Oct 2008 16:03:24 +0000 Subject: [PATCH 1/3] Monotone-Parent: 222ceca8e71fe7e1c2395ac641b067b96b94ae3f Monotone-Revision: 3550dd70ecbb9d12c44ec69561f97a455b714c93 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-10-08T16:03:24 Monotone-Branch: ca.inverse.sogo --- SoObjects/Appointments/SOGoAppointmentFolder.m | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m index 05df997bb..35543a631 100644 --- a/SoObjects/Appointments/SOGoAppointmentFolder.m +++ b/SoObjects/Appointments/SOGoAppointmentFolder.m @@ -492,20 +492,12 @@ static Class sogoAppointmentFolderKlass = Nil; GCSFolder *folder; NSString *sql, *dateSqlString, *titleSqlString, *componentSqlString, *filterSqlString; - NGCalendarDateRange *r; folder = [self ocsFolder]; if (startDate && endDate) - { - r = [NGCalendarDateRange calendarDateRangeWithStartDate: startDate - endDate: endDate]; - dateSqlString = [self _sqlStringRangeFrom: startDate to: endDate]; - } + dateSqlString = [self _sqlStringRangeFrom: startDate to: endDate]; else - { - r = nil; - dateSqlString = @""; - } + dateSqlString = @""; if ([title length]) titleSqlString = [NSString stringWithFormat: @"AND (c_title" From 9e860430f45924d49e05f36dcabb94f8cfe85251 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Wed, 8 Oct 2008 16:25:30 +0000 Subject: [PATCH 2/3] Updated the string files for the "Priority" string. Monotone-Parent: 222ceca8e71fe7e1c2395ac641b067b96b94ae3f Monotone-Revision: ac68ed83f444da4e4bab62959d53aad8ed53ff55 Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2008-10-08T16:25:30 Monotone-Branch: ca.inverse.sogo --- UI/MailerUI/Dutch.lproj/Localizable.strings | 1 + UI/MailerUI/English.lproj/Localizable.strings | 1 + UI/MailerUI/French.lproj/Localizable.strings | 1 + UI/MailerUI/German.lproj/Localizable.strings | 1 + UI/MailerUI/Italian.lproj/Localizable.strings | 1 + UI/MailerUI/Spanish.lproj/Localizable.strings | 1 + 6 files changed, 6 insertions(+) diff --git a/UI/MailerUI/Dutch.lproj/Localizable.strings b/UI/MailerUI/Dutch.lproj/Localizable.strings index 04b896315..486052837 100644 --- a/UI/MailerUI/Dutch.lproj/Localizable.strings +++ b/UI/MailerUI/Dutch.lproj/Localizable.strings @@ -21,6 +21,7 @@ "Contacts" = "Adresboek"; "Attach" = "Bijlage"; "Save" = "Opslaan"; +"Priority" = "Priority"; /* Main Frame */ diff --git a/UI/MailerUI/English.lproj/Localizable.strings b/UI/MailerUI/English.lproj/Localizable.strings index 9bf934107..fa8086a74 100644 --- a/UI/MailerUI/English.lproj/Localizable.strings +++ b/UI/MailerUI/English.lproj/Localizable.strings @@ -18,6 +18,7 @@ "Contacts" = "Contacts"; "Attach" = "Attach"; "Save" = "Save"; +"Priority" = "Priority"; /* Tooltips */ diff --git a/UI/MailerUI/French.lproj/Localizable.strings b/UI/MailerUI/French.lproj/Localizable.strings index 926414dbd..add39f772 100644 --- a/UI/MailerUI/French.lproj/Localizable.strings +++ b/UI/MailerUI/French.lproj/Localizable.strings @@ -21,6 +21,7 @@ "Contacts" = "Contacts"; "Attach" = "Joindre"; "Save" = "Enregistrer"; +"Priority" = "Priorité"; /* Tooltips */ diff --git a/UI/MailerUI/German.lproj/Localizable.strings b/UI/MailerUI/German.lproj/Localizable.strings index 858d40328..f6569ed16 100644 --- a/UI/MailerUI/German.lproj/Localizable.strings +++ b/UI/MailerUI/German.lproj/Localizable.strings @@ -22,6 +22,7 @@ "Contacts" = "Kontakte"; "Attach" = "Anhang"; "Save" = "Speichern"; +"Priority" = "Priority"; /* Main Frame */ diff --git a/UI/MailerUI/Italian.lproj/Localizable.strings b/UI/MailerUI/Italian.lproj/Localizable.strings index 3a7b9d072..0886f1ba7 100644 --- a/UI/MailerUI/Italian.lproj/Localizable.strings +++ b/UI/MailerUI/Italian.lproj/Localizable.strings @@ -21,6 +21,7 @@ "Contacts" = "Contatti"; "Attach" = "Allegato"; "Save" = "Salva"; +"Priority" = "Priority"; /* Tooltips */ diff --git a/UI/MailerUI/Spanish.lproj/Localizable.strings b/UI/MailerUI/Spanish.lproj/Localizable.strings index cef04a8af..5b3119dce 100644 --- a/UI/MailerUI/Spanish.lproj/Localizable.strings +++ b/UI/MailerUI/Spanish.lproj/Localizable.strings @@ -24,6 +24,7 @@ "Contacts" = "Contactos"; "Attach" = "Adjuntar"; "Save" = "Guardar"; +"Priority" = "Priority"; /* Tooltips */ From 6ab5cfa937e20ed611eef6b45cb5fe18122e370d Mon Sep 17 00:00:00 2001 From: C Robert Date: Wed, 8 Oct 2008 18:38:03 +0000 Subject: [PATCH 3/3] Fixed a translation bug in MessageListView Monotone-Parent: 4b5ba0c0b794837c553c64a3c5e55717bd636b7b Monotone-Revision: a1a0f6f62f6d3e023e2fadcfe803aad3abadef82 Monotone-Author: crobert@inverse.ca Monotone-Date: 2008-10-08T18:38:03 Monotone-Branch: ca.inverse.sogo --- UI/MailerUI/UIxMailListView.h | 2 ++ UI/MailerUI/UIxMailListView.m | 7 +++++++ UI/Templates/MailerUI/UIxMailListView.wox | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/UI/MailerUI/UIxMailListView.h b/UI/MailerUI/UIxMailListView.h index 8da0e5aaf..85f2e91b7 100644 --- a/UI/MailerUI/UIxMailListView.h +++ b/UI/MailerUI/UIxMailListView.h @@ -24,6 +24,7 @@ #import +@class NSDictionary; @class EOQualifier; @class SOGoDateFormatter; @@ -37,6 +38,7 @@ SOGoDateFormatter *dateFormatter; NSTimeZone *userTimeZone; int folderType; + NSDictionary *currentColumn; } - (NSString *) defaultSortKey; diff --git a/UI/MailerUI/UIxMailListView.m b/UI/MailerUI/UIxMailListView.m index 8a77b0b38..e73b96444 100644 --- a/UI/MailerUI/UIxMailListView.m +++ b/UI/MailerUI/UIxMailListView.m @@ -68,6 +68,7 @@ ASSIGN (dateFormatter, [user dateFormatterInContext: context]); ASSIGN (userTimeZone, [user timeZone]); folderType = 0; + currentColumn = nil; } return self; @@ -81,6 +82,7 @@ [message release]; [dateFormatter release]; [userTimeZone release]; + [currentColumn release]; [super dealloc]; } @@ -735,6 +737,11 @@ return columnsMetaData; } +- (NSString *) columnTitle +{ + return [self labelForKey: [currentColumn objectForKey: @"value"]]; +} + @end /* UIxMailListView */ diff --git a/UI/Templates/MailerUI/UIxMailListView.wox b/UI/Templates/MailerUI/UIxMailListView.wox index 19c87d753..82c762adf 100644 --- a/UI/Templates/MailerUI/UIxMailListView.wox +++ b/UI/Templates/MailerUI/UIxMailListView.wox @@ -23,7 +23,7 @@ - +