From ae59046b1e5dd2c55e074e8e3d24e04ce8001b8e Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 31 Dec 2010 12:42:26 -0800
Subject: [PATCH] Bookmark plugin: tweak post-upload success message to
 distinguish between "already done" (UnQueueManager) and "started, should
 finish eventually" (other queue manager)

---
 plugins/Bookmark/importdelicious.php | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/plugins/Bookmark/importdelicious.php b/plugins/Bookmark/importdelicious.php
index f8529cc914..b98b215717 100644
--- a/plugins/Bookmark/importdelicious.php
+++ b/plugins/Bookmark/importdelicious.php
@@ -48,6 +48,7 @@ if (!defined('STATUSNET')) {
 class ImportdeliciousAction extends Action
 {
     protected $success = false;
+    private $inprogress = false;
 
     /**
      * Return the title of the page
@@ -191,7 +192,13 @@ class ImportdeliciousAction extends Action
             $qm = QueueManager::get();
             $qm->enqueue(array(common_current_user(), $html), 'dlcsback');
 
-            $this->success = true;
+            if ($qm instanceof UnQueueManager) {
+                // No active queuing means we've actually just completed the job!
+                $this->success = true;
+            } else {
+                // We've fed data into background queues, and it's probably still running.
+                $this->inprogress = true;
+            }
 
             $this->showPage();
 
@@ -212,8 +219,10 @@ class ImportdeliciousAction extends Action
     {
         if ($this->success) {
             $this->element('p', null,
-                           _('Feed will be restored. '.
-                             'Please wait a few minutes for results.'));
+                           _('Bookmarks have been imported. Your bookmarks should now appear in search and your profile page.'));
+        } else if ($this->inprogress) {
+            $this->element('p', null,
+                           _('Bookmarks are being imported. Please wait a few minutes for results.'));
         } else {
             $form = new ImportDeliciousForm($this);
             $form->show();