merge of '32ab392d3b7d226db707f5c0a95d358eb0d5d4de'

and 'a1a0f6f62f6d3e023e2fadcfe803aad3abadef82'

Monotone-Parent: 32ab392d3b7d226db707f5c0a95d358eb0d5d4de
Monotone-Parent: a1a0f6f62f6d3e023e2fadcfe803aad3abadef82
Monotone-Revision: 2294f2d1071cb09dc3b530c8183183338ceee302

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2008-10-09T18:37:16
Monotone-Branch: ca.inverse.sogo

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"

UI/MailerUI/Dutch.lproj/Localizable.strings

@@ -21,6 +21,7 @@
 "Contacts" = "Adresboek";
 "Attach" = "Bijlage";
 "Save" = "Opslaan";
+"Priority" = "Priority";
 
 /* Main Frame  */
 

UI/MailerUI/English.lproj/Localizable.strings

@@ -18,6 +18,7 @@
 "Contacts" = "Contacts";
 "Attach" = "Attach";
 "Save" = "Save";
+"Priority" = "Priority";
 
 /* Tooltips */
 

UI/MailerUI/French.lproj/Localizable.strings

@@ -21,6 +21,7 @@
 "Contacts" = "Contacts";
 "Attach" = "Joindre";
 "Save" = "Enregistrer";
+"Priority" = "Priorité";
 
 /* Tooltips */
 

UI/MailerUI/German.lproj/Localizable.strings

@@ -22,6 +22,7 @@
 "Contacts" = "Kontakte";
 "Attach" = "Anhang";
 "Save" = "Speichern";
+"Priority" = "Priority";
 
 /* Main Frame  */
 

UI/MailerUI/Italian.lproj/Localizable.strings

@@ -21,6 +21,7 @@
 "Contacts" = "Contatti";
 "Attach" = "Allegato";
 "Save" = "Salva";
+"Priority" = "Priority";
 
 /* Tooltips */
 

UI/MailerUI/Spanish.lproj/Localizable.strings

@@ -24,6 +24,7 @@
 "Contacts" = "Contactos";
 "Attach" = "Adjuntar";
 "Save" = "Guardar";
+"Priority" = "Priority";
 
 /* Tooltips */
 

UI/MailerUI/UIxMailListView.h

@@ -24,6 +24,7 @@
 
 #import <SOGoUI/UIxComponent.h>
 
+@class NSDictionary;
 @class EOQualifier;
 @class SOGoDateFormatter;
 
@@ -37,6 +38,7 @@
   SOGoDateFormatter *dateFormatter;
   NSTimeZone *userTimeZone;
   int folderType;
+  NSDictionary *currentColumn;
 }
 
 - (NSString *) defaultSortKey;

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 */

UI/Templates/MailerUI/UIxMailListView.wox

@@ -23,7 +23,7 @@
           <var:if condition="currentColumn.value" const:value="Invisible" const:negate="YES">
             <var:if condition="currentColumn.value" const:value="Attachment" const:negate="YES">
               <var:if condition="currentColumn.value" const:value="Unread" const:negate="YES">
-                <var:string var:value="currentColumn.value" />
+                <var:string var:value="columnTitle" />
               </var:if>
             </var:if>
           </var:if>