diff options
Diffstat (limited to 'src/Wallabag/ImportBundle/Resources')
-rw-r--r-- | src/Wallabag/ImportBundle/Resources/config/services.yml | 2 | ||||
-rw-r--r-- | src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/Wallabag/ImportBundle/Resources/config/services.yml b/src/Wallabag/ImportBundle/Resources/config/services.yml index e0942b1a..86b44cb3 100644 --- a/src/Wallabag/ImportBundle/Resources/config/services.yml +++ b/src/Wallabag/ImportBundle/Resources/config/services.yml | |||
@@ -28,6 +28,7 @@ services: | |||
28 | class: Wallabag\ImportBundle\Import\WallabagV1Import | 28 | class: Wallabag\ImportBundle\Import\WallabagV1Import |
29 | arguments: | 29 | arguments: |
30 | - "@doctrine.orm.entity_manager" | 30 | - "@doctrine.orm.entity_manager" |
31 | - "@wallabag_core.content_proxy" | ||
31 | calls: | 32 | calls: |
32 | - [ setLogger, [ "@logger" ]] | 33 | - [ setLogger, [ "@logger" ]] |
33 | tags: | 34 | tags: |
@@ -37,6 +38,7 @@ services: | |||
37 | class: Wallabag\ImportBundle\Import\WallabagV2Import | 38 | class: Wallabag\ImportBundle\Import\WallabagV2Import |
38 | arguments: | 39 | arguments: |
39 | - "@doctrine.orm.entity_manager" | 40 | - "@doctrine.orm.entity_manager" |
41 | - "@wallabag_core.content_proxy" | ||
40 | calls: | 42 | calls: |
41 | - [ setLogger, [ "@logger" ]] | 43 | - [ setLogger, [ "@logger" ]] |
42 | tags: | 44 | tags: |
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 @@ | |||
7 | <div class="card-panel settings"> | 7 | <div class="card-panel settings"> |
8 | {% if not has_consumer_key %} | 8 | {% if not has_consumer_key %} |
9 | <div class="card-panel red darken-1"> | 9 | <div class="card-panel red darken-1"> |
10 | {% trans %}Pocket import isn't configured. You need to define pocket_consumer_key.{% endtrans %} | 10 | {% trans %}Pocket import isn't configured.{% endtrans %} |
11 | {% if is_granted('ROLE_SUPER_ADMIN') %} | ||
12 | {% 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 %} | ||
13 | {% else %} | ||
14 | {% trans %}Your server admin needs to define an API Key for Pocket.{% endtrans %} | ||
15 | {% endif %} | ||
11 | </div> | 16 | </div> |
12 | {% endif %} | 17 | {% endif %} |
13 | 18 | ||