From 9ce1b2dfb30e322f8865e9c8bd16268ccaa93e30 Mon Sep 17 00:00:00 2001
From: C Robert <crobert@inverse.ca>
Date: Tue, 22 Sep 2009 15:43:38 +0000
Subject: [PATCH] Fixed translation for contacts/calendar exported filename

Monotone-Parent: 35156d431d203984a125b3638bbea9d7877ed199
Monotone-Revision: 38d99d8e3c69a7b418c3c71ebadc112262ad53db

Monotone-Author: crobert@inverse.ca
Monotone-Date: 2009-09-22T15:43:38
Monotone-Branch: ca.inverse.sogo
---
 UI/Contacts/UIxContactFolderActions.m | 7 +++++--
 UI/Scheduler/UIxCalFolderActions.m    | 6 ++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/UI/Contacts/UIxContactFolderActions.m b/UI/Contacts/UIxContactFolderActions.m
index 4dfc2a99d..e3b469e4d 100644
--- a/UI/Contacts/UIxContactFolderActions.m
+++ b/UI/Contacts/UIxContactFolderActions.m
@@ -56,7 +56,7 @@
   id <WOActionResults> response;
   NSArray *contactsId;
   NSEnumerator *uids;
-  NSString *uid;
+  NSString *uid, *filename;
   id currentChild;
   SOGoContactGCSFolder *sourceFolder;
   NSMutableString *content;
@@ -79,10 +79,13 @@
             [content appendFormat: [[currentChild vList] ldifString]];
         }
     }
+
+  filename = [NSString stringWithFormat: @"attachment;filename=%@.ldif", 
+              [self labelForKey: @"Contacts"]];
   response = [context response];
   [response setHeader: @"text/directory; charset=utf-8" 
                forKey: @"content-type"];
-  [response setHeader: @"attachment;filename=SavedContacts.ldif" 
+  [response setHeader: filename 
                forKey: @"Content-Disposition"];
   [response setContent: [content dataUsingEncoding: NSUTF8StringEncoding]];
   
diff --git a/UI/Scheduler/UIxCalFolderActions.m b/UI/Scheduler/UIxCalFolderActions.m
index 04c70e874..5cba79b13 100644
--- a/UI/Scheduler/UIxCalFolderActions.m
+++ b/UI/Scheduler/UIxCalFolderActions.m
@@ -46,6 +46,7 @@
   SOGoAppointmentObject *appt;
   NSArray *array, *values, *fields;
   NSMutableString *rc;
+  NSString *filename;
   iCalCalendar *calendar, *component;
   int i, count;
 
@@ -82,11 +83,12 @@
       if (values && [values count])
         [calendar addChildren: values];
     }
-  NSLog ([calendar versitString]);
   
+  filename = [NSString stringWithFormat: @"attachment;filename=%@.ics",
+              [self labelForKey: @"Calendar"]];
   [response setHeader: @"text/calendar; charset=utf-8" 
                forKey:@"content-type"];
-  [response setHeader: @"attachment;filename=Calendar.ics" 
+  [response setHeader: filename 
                forKey: @"Content-Disposition"];
   [response setContent: [[calendar versitString] dataUsingEncoding: NSUTF8StringEncoding]];