diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-09-13 21:09:05 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-09-13 21:09:05 +0200 |
commit | c80cc01afa315dcfa38b2a01c5b05d4516659c24 (patch) | |
tree | b6c51e22260584b2c340358d384bddf13b8c9418 /src/Wallabag/ImportBundle/Controller | |
parent | e01a3c98d6908e95121b5ade0161f40af1b05ca6 (diff) | |
download | wallabag-c80cc01afa315dcfa38b2a01c5b05d4516659c24.tar.gz wallabag-c80cc01afa315dcfa38b2a01c5b05d4516659c24.tar.zst wallabag-c80cc01afa315dcfa38b2a01c5b05d4516659c24.zip |
Change flash message for queued articles
Diffstat (limited to 'src/Wallabag/ImportBundle/Controller')
3 files changed, 18 insertions, 0 deletions
diff --git a/src/Wallabag/ImportBundle/Controller/PocketController.php b/src/Wallabag/ImportBundle/Controller/PocketController.php index 3d555717..1f92c182 100644 --- a/src/Wallabag/ImportBundle/Controller/PocketController.php +++ b/src/Wallabag/ImportBundle/Controller/PocketController.php | |||
@@ -102,6 +102,12 @@ class PocketController extends Controller | |||
102 | '%imported%' => $summary['imported'], | 102 | '%imported%' => $summary['imported'], |
103 | '%skipped%' => $summary['skipped'], | 103 | '%skipped%' => $summary['skipped'], |
104 | ]); | 104 | ]); |
105 | |||
106 | if (0 < $summary['queued']) { | ||
107 | $message = $this->get('translator')->trans('flashes.import.notice.summary_with_queue', [ | ||
108 | '%queued%' => $summary['queued'], | ||
109 | ]); | ||
110 | } | ||
105 | } | 111 | } |
106 | 112 | ||
107 | $this->get('session')->getFlashBag()->add( | 113 | $this->get('session')->getFlashBag()->add( |
diff --git a/src/Wallabag/ImportBundle/Controller/ReadabilityController.php b/src/Wallabag/ImportBundle/Controller/ReadabilityController.php index 8775e8a3..d00e22c2 100644 --- a/src/Wallabag/ImportBundle/Controller/ReadabilityController.php +++ b/src/Wallabag/ImportBundle/Controller/ReadabilityController.php | |||
@@ -46,6 +46,12 @@ class ReadabilityController extends Controller | |||
46 | '%skipped%' => $summary['skipped'], | 46 | '%skipped%' => $summary['skipped'], |
47 | ]); | 47 | ]); |
48 | 48 | ||
49 | if (0 < $summary['queued']) { | ||
50 | $message = $this->get('translator')->trans('flashes.import.notice.summary_with_queue', [ | ||
51 | '%queued%' => $summary['queued'], | ||
52 | ]); | ||
53 | } | ||
54 | |||
49 | unlink($this->getParameter('wallabag_import.resource_dir').'/'.$name); | 55 | unlink($this->getParameter('wallabag_import.resource_dir').'/'.$name); |
50 | } | 56 | } |
51 | 57 | ||
diff --git a/src/Wallabag/ImportBundle/Controller/WallabagController.php b/src/Wallabag/ImportBundle/Controller/WallabagController.php index 3c2dd6d1..9c0cde80 100644 --- a/src/Wallabag/ImportBundle/Controller/WallabagController.php +++ b/src/Wallabag/ImportBundle/Controller/WallabagController.php | |||
@@ -60,6 +60,12 @@ abstract class WallabagController extends Controller | |||
60 | '%skipped%' => $summary['skipped'], | 60 | '%skipped%' => $summary['skipped'], |
61 | ]); | 61 | ]); |
62 | 62 | ||
63 | if (0 < $summary['queued']) { | ||
64 | $message = $this->get('translator')->trans('flashes.import.notice.summary_with_queue', [ | ||
65 | '%queued%' => $summary['queued'], | ||
66 | ]); | ||
67 | } | ||
68 | |||
63 | unlink($this->getParameter('wallabag_import.resource_dir').'/'.$name); | 69 | unlink($this->getParameter('wallabag_import.resource_dir').'/'.$name); |
64 | } | 70 | } |
65 | 71 | ||