oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-08-21 18:11:10 +00:00
Code Wiki Activity

Add flashes messages

Browse source
This commit is contained in:
Jeremy Benoist 2016-03-11 14:48:46 +01:00
parent 4f9cf232f8
commit 4204a06b77
11 changed files with 94 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/Wallabag/ImportBundle/Controller/WallabagV2Controller.php
View file

@ -31,11 +31,14 @@ class WallabagV2Controller extends Controller
->setMarkAsRead($markAsRead)
->import();
$message = 'Import failed, please try again.';
$message = 'flashes.import.notice.failed';
if (true === $res) {
$summary = $wallabag->getSummary();
$message = 'Import summary: '.$summary['imported'].' imported, '.$summary['skipped'].' already saved.';
$message = $this->get('translator')->trans('flashes.import.notice.summary', array(
'%imported%' => $summary['imported'],
'%skipped%' => $summary['skipped'],
));
unlink($this->getParameter('wallabag_import.resource_dir').'/'.$name);
}
@ -49,7 +52,7 @@ class WallabagV2Controller extends Controller
} else {
$this->get('session')->getFlashBag()->add(
'notice',
'Error while processing import. Please verify your import file.'
'flashes.import.notice.failed_on_file'
);
}
}