From 6ab5cfa937e20ed611eef6b45cb5fe18122e370d Mon Sep 17 00:00:00 2001
From: C Robert <crobert@inverse.ca>
Date: Wed, 8 Oct 2008 18:38:03 +0000
Subject: [PATCH] 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 <SOGoUI/UIxComponent.h>
 
+@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 @@
           <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>