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";