From: Jeremy Benoist Date: Thu, 21 Jan 2016 09:59:21 +0000 (+0100) Subject: Add warning message for PocketImport X-Git-Tag: 2.0.0-beta.1~58^2~9 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=1e3ed714707878caa603ffdc262e64abb6ddfb5c;p=github%2Fwallabag%2Fwallabag.git Add warning message for PocketImport Warn user if pocket_consumer_key isn't defined --- diff --git a/src/Wallabag/ImportBundle/Controller/PocketController.php b/src/Wallabag/ImportBundle/Controller/PocketController.php index 7aee302f..1c1b4fa8 100644 --- a/src/Wallabag/ImportBundle/Controller/PocketController.php +++ b/src/Wallabag/ImportBundle/Controller/PocketController.php @@ -15,6 +15,7 @@ class PocketController extends Controller { return $this->render('WallabagImportBundle:Pocket:index.html.twig', [ 'import' => $this->get('wallabag_import.pocket.import'), + 'has_consumer_key' => '' == trim($this->get('craue_config')->get('pocket_consumer_key')) ? false : true, ]); } diff --git a/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig b/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig index 643ad775..e0e36f38 100644 --- a/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig +++ b/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig @@ -5,6 +5,12 @@
+ {% if not has_consumer_key %} +
+ {% trans %}Pocket import isn't configured. You need to define pocket_consumer_key.{% endtrans %} +
+ {% endif %} +
{{ import.description|trans }}

{% trans %}You can import your data from your Pocket account. You just have to click on the below button and authorize the application to connect to getpocket.com.{% endtrans %}