From 4c07a83b6911852b69ebb0b55b6608b6563b8712 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Thu, 11 Feb 2016 01:42:37 +0100
Subject: lots of diverse translation stuff & some typos

---
 src/Wallabag/ImportBundle/Import/WallabagV2Import.php            | 2 +-
 src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/Wallabag/ImportBundle')

diff --git a/src/Wallabag/ImportBundle/Import/WallabagV2Import.php b/src/Wallabag/ImportBundle/Import/WallabagV2Import.php
index c5c0d5a7..7125eabc 100644
--- a/src/Wallabag/ImportBundle/Import/WallabagV2Import.php
+++ b/src/Wallabag/ImportBundle/Import/WallabagV2Import.php
@@ -27,7 +27,7 @@ class WallabagV2Import extends WallabagV1Import implements ImportInterface
      */
     public function getDescription()
     {
-        return 'This importer will import all your wallabag v2 articles. On the export sidebar, click on "JSON". You will have a "Unread articles.json" file.';
+        return 'This importer will import all your wallabag v2 articles. Go to All articles, then, on the export sidebar, click on "JSON". You will have a "All articles.json" file.';
     }
 
     /**
diff --git a/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig b/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
index e0e36f38..8aa5da97 100644
--- a/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
+++ b/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
@@ -7,7 +7,12 @@
         <div class="card-panel settings">
             {% if not has_consumer_key %}
                 <div class="card-panel red darken-1">
-                    {% trans %}Pocket import isn't configured. You need to define pocket_consumer_key.{% endtrans %}
+                    {% trans %}Pocket import isn't configured.{% endtrans %}
+                    {% if is_granted('ROLE_SUPER_ADMIN') %}
+                        {% trans with {'%keyurls%': '<a href="' ~ path('craue_config_settings_modify') ~ '#set-import">', '%keyurle%':'</a>'} %}You need to define %keyurls% a pocket_consumer_key %keyurle%.{% endtrans %}
+                    {% else %}
+                        {% trans %}Your server admin needs to define an API Key for Pocket.{% endtrans %}
+                    {% endif %}
                 </div>
             {% endif %}
 
-- 
cgit v1.2.3