Change flash message for queued articles

src/Wallabag/CoreBundle/Resources/translations/messages.da.yml

@@ -430,6 +430,7 @@ flashes:
             # failed: 'Import failed, please try again.'
             # failed_on_file: 'Error while processing import. Please verify your import file.'
             # summary: 'Import summary: %imported% imported, %skipped% already saved.'
+            # summary_with_queue: 'Import summary: %queued% queued.'
     developer:
         notice:
             # client_created: 'New client created.'

src/Wallabag/CoreBundle/Resources/translations/messages.de.yml

@@ -430,6 +430,7 @@ flashes:
             failed: 'Import fehlgeschlagen, bitte erneut probieren.'
             failed_on_file: 'Fehler während des Imports. Bitte überprüfe deine Import-Datei.'
             summary: 'Import-Zusammenfassung: %imported% importiert, %skipped% bereits gespeichert.'
+            # summary_with_queue: 'Import summary: %queued% queued.'
     developer:
         notice:
             client_created: 'Neuer Client erstellt.'

src/Wallabag/CoreBundle/Resources/translations/messages.en.yml

@@ -432,6 +432,7 @@ flashes:
             failed: 'Import failed, please try again.'
             failed_on_file: 'Error while processing import. Please verify your import file.'
             summary: 'Import summary: %imported% imported, %skipped% already saved.'
+            summary_with_queue: 'Import summary: %queued% queued.'
     developer:
         notice:
             client_created: 'New client %name% created.'

src/Wallabag/CoreBundle/Resources/translations/messages.es.yml

@@ -427,9 +427,10 @@ flashes:
             tag_added: 'Etiqueta añadida'
     import:
         notice:
-             failed: 'Importación reprobada, por favor inténtelo de nuevo.'
-             failed_on_file: 'Se ocurre un error por procesar importación. Por favor verifique su archivo importado.'
-             summary: 'Resúmen importado: %importado% importado, %saltados% ya guardado.'
+            failed: 'Importación reprobada, por favor inténtelo de nuevo.'
+            failed_on_file: 'Se ocurre un error por procesar importación. Por favor verifique su archivo importado.'
+            summary: 'Resúmen importado: %importado% importado, %saltados% ya guardado.'
+            # summary_with_queue: 'Import summary: %queued% queued.'
     developer:
         notice:
             client_created: 'Nuevo cliente creado.'

src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml

@@ -430,6 +430,7 @@ flashes:
             failed: 'درون‌ریزی شکست خورد. لطفاً دوباره تلاش کنید.'
             failed_on_file: 'خطا هنگام پردازش پروندهٔ ورودی. آیا پروندهٔ درون‌ریزی شده سالم است؟'
             summary: 'گزارش درون‌ریزی: %imported% وارد شد, %skipped% از قبل ذخیره شده بود.'
+            # summary_with_queue: 'Import summary: %queued% queued.'
     developer:
         notice:
             # client_created: 'New client created.'

src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml

@@ -432,6 +432,7 @@ flashes:
             failed: "L'import a échoué, veuillez ré-essayer"
             failed_on_file: "Erreur lors du traitement de l'import. Vérifier votre fichier."
             summary: "Rapport d'import: %imported% importés, %skipped% déjà présent."
+            summary_with_queue: "Rapport d'import: %queued% en cours de traitement."
     developer:
         notice:
             client_created: 'Nouveau client %name% créé'

src/Wallabag/CoreBundle/Resources/translations/messages.it.yml

@@ -429,6 +429,7 @@ flashes:
             failed: 'Importazione fallita, riprova.'
             failed_on_file: 'Errore durante la processazione dei dati da importare. Verifica il tuo file di import.'
             summary: 'Sommario di importazione: %imported% importati, %skipped% già salvati.'
+            # summary_with_queue: 'Import summary: %queued% queued.'
     developer:
         notice:
             client_created: 'Nuovo client creato.'

src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml

@@ -430,6 +430,7 @@ flashes:
             failed: "L'importacion a fracassat, mercés de tornar ensajar"
             failed_on_file: "Errorr pendent du tractament de l'import. Mercés de verificar vòstre fichièr."
             summary: "Rapòrt d'import: %imported% importats, %skipped% ja presents."
+            # summary_with_queue: 'Import summary: %queued% queued.'
     developer:
         notice:
             client_created: 'Novèl client creat'

src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml

@@ -430,6 +430,7 @@ flashes:
             failed: 'Nieudany import, prosimy spróbować ponownie.'
             failed_on_file: 'Błąd podczas ptrzetwarzania pliku. Sprawdż swój importowany plik.'
             summary: 'Podsumowanie importu: %imported% zaimportowane, %skipped% już zapisane.'
+            # summary_with_queue: 'Import summary: %queued% queued.'
     developer:
         notice:
             client_created: 'Nowy klient utworzony.'

src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml

@@ -430,6 +430,7 @@ flashes:
             # failed: 'Import failed, please try again.'
             # failed_on_file: 'Error while processing import. Please verify your import file.'
             # summary: 'Import summary: %imported% imported, %skipped% already saved.'
+            # summary_with_queue: 'Import summary: %queued% queued.'
     developer:
         notice:
             # client_created: 'New client created.'

src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml

@@ -430,6 +430,7 @@ flashes:
             # failed: 'Import failed, please try again.'
             # failed_on_file: 'Error while processing import. Please verify your import file.'
             # summary: 'Import summary: %imported% imported, %skipped% already saved.'
+            # summary_with_queue: 'Import summary: %queued% queued.'
     developer:
         notice:
             # client_created: 'New client created.'

src/Wallabag/ImportBundle/Controller/PocketController.php

@@ -102,6 +102,12 @@ class PocketController extends Controller
                 '%imported%' => $summary['imported'],
                 '%skipped%' => $summary['skipped'],
             ]);
+
+            if (0 < $summary['queued']) {
+                $message = $this->get('translator')->trans('flashes.import.notice.summary_with_queue', [
+                    '%queued%' => $summary['queued'],
+                ]);
+            }
         }
 
         $this->get('session')->getFlashBag()->add(

src/Wallabag/ImportBundle/Controller/ReadabilityController.php

@@ -46,6 +46,12 @@ class ReadabilityController extends Controller
                         '%skipped%' => $summary['skipped'],
                     ]);
 
+                    if (0 < $summary['queued']) {
+                        $message = $this->get('translator')->trans('flashes.import.notice.summary_with_queue', [
+                            '%queued%' => $summary['queued'],
+                        ]);
+                    }
+
                     unlink($this->getParameter('wallabag_import.resource_dir').'/'.$name);
                 }
 

src/Wallabag/ImportBundle/Controller/WallabagController.php

@@ -60,6 +60,12 @@ abstract class WallabagController extends Controller
                         '%skipped%' => $summary['skipped'],
                     ]);
 
+                    if (0 < $summary['queued']) {
+                        $message = $this->get('translator')->trans('flashes.import.notice.summary_with_queue', [
+                            '%queued%' => $summary['queued'],
+                        ]);
+                    }
+
                     unlink($this->getParameter('wallabag_import.resource_dir').'/'.$name);
                 }
 

src/Wallabag/ImportBundle/Import/AbstractImport.php

@@ -21,6 +21,7 @@ abstract class AbstractImport implements ImportInterface
     protected $markAsRead;
     protected $skippedEntries = 0;
     protected $importedEntries = 0;
+    protected $queuedEntries = 0;
 
     public function __construct(EntityManager $em, ContentProxy $contentProxy)
     {
@@ -145,12 +146,24 @@ abstract class AbstractImport implements ImportInterface
                 $importedEntry = $this->setEntryAsRead($importedEntry);
             }
 
-            ++$this->importedEntries;
+            ++$this->queuedEntries;
 
             $this->producer->publish(json_encode($importedEntry));
         }
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getSummary()
+    {
+        return [
+            'skipped' => $this->skippedEntries,
+            'imported' => $this->importedEntries,
+            'queued' => $this->queuedEntries,
+        ];
+    }
+
     /**
      * Parse one entry.
      *

src/Wallabag/ImportBundle/Import/PocketImport.php

@@ -172,17 +172,6 @@ class PocketImport extends AbstractImport
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getSummary()
-    {
-        return [
-            'skipped' => $this->skippedEntries,
-            'imported' => $this->importedEntries,
-        ];
-    }
-
     /**
      * Set the Guzzle client.
      *

src/Wallabag/ImportBundle/Import/ReadabilityImport.php

@@ -44,17 +44,6 @@ class ReadabilityImport extends AbstractImport
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getSummary()
-    {
-        return [
-            'skipped' => $this->skippedEntries,
-            'imported' => $this->importedEntries,
-        ];
-    }
-
     /**
      * {@inheritdoc}
      */

src/Wallabag/ImportBundle/Import/WallabagImport.php

@@ -72,17 +72,6 @@ abstract class WallabagImport extends AbstractImport
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getSummary()
-    {
-        return [
-            'skipped' => $this->skippedEntries,
-            'imported' => $this->importedEntries,
-        ];
-    }
-
     /**
      * Set file path to the json file.
      *