From 476bb879bb7c3e247d8bbb85af51cf553279497c Mon Sep 17 00:00:00 2001
From: C Robert <crobert@inverse.ca>
Date: Thu, 3 Sep 2009 18:37:08 +0000
Subject: [PATCH] Fixed IE-related issues

Monotone-Parent: 95ed8a2f8950868651d78738a3745fb83e43881a
Monotone-Revision: f03e9d5d24d638e67140a1f29d1e833ae439ef6d

Monotone-Author: crobert@inverse.ca
Monotone-Date: 2009-09-03T18:37:08
Monotone-Branch: ca.inverse.sogo
---
 UI/Contacts/UIxContactsListView.m    |  7 -------
 UI/WebServerResources/ContactsUI.js  | 10 ++++++----
 UI/WebServerResources/SchedulerUI.js | 10 ++++++----
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/UI/Contacts/UIxContactsListView.m b/UI/Contacts/UIxContactsListView.m
index f48429ac0..102b21d8f 100644
--- a/UI/Contacts/UIxContactsListView.m
+++ b/UI/Contacts/UIxContactsListView.m
@@ -261,13 +261,6 @@
 
   [rc setObject: [NSNumber numberWithInt: imported]
          forKey: @"imported"];
-  if (imported <= 0)
-    [rc setObject: [self labelForKey: @"An error occured while importing contacts."]
-           forKey: @"message"];
-  else
-    [rc setObject: [NSString stringWithFormat: @"%@ %d", 
-     [self labelForKey: @"Imported contacts:"], imported]
-           forKey: @"message"];
 
   response = [self responseWithStatus: 200];
   [response setHeader: @"text/html" 
diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js
index 375f4d670..0aa624ce4 100644
--- a/UI/WebServerResources/ContactsUI.js
+++ b/UI/WebServerResources/ContactsUI.js
@@ -694,10 +694,12 @@ function uploadCompleted (response) {
 
     var div = $("uploadResults");
     $("uploadOK").onclick = hideImportResults;
-    $("uploadResultsContent").update (data.message);
-
-    if (data.imported > 0)
-      refreshCurrentFolder ();
+    if (data.imported <= 0)
+      $("uploadResultsContent").update (labels["An error occured while importing contacts."]);
+    else {
+        $("uploadResultsContent").update (labels["Imported contacts:"] + " " + data.imported);
+        refreshCurrentFolder ();
+    }
 
     hideContactsImport ();
     $("uploadResults").style.display = "block";
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index 5abd1ba72..33ad4d900 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -1928,10 +1928,12 @@ function uploadCompleted (response) {
 
     var div = $("uploadResults");
     $("uploadOK").onclick = hideImportResults;
-    $("uploadResultsContent").update (data.message);
-
-    if (data.imported > 0)
-      refreshCurrentFolder ();
+    if (data.imported <= 0)
+      $("uploadResultsContent").update (labels["An error occured while importing calendar."]);
+    else {
+        $("uploadResultsContent").update (labels["Imported events:"] + " " + data.imported);
+        refreshCurrentFolder ();
+    }
 
     hideCalendarImport ();
     $("uploadResults").style.display = "block";