diff options
Diffstat (limited to 'src/Wallabag/ImportBundle/Resources')
4 files changed, 5 insertions, 3 deletions
diff --git a/src/Wallabag/ImportBundle/Resources/config/services.yml b/src/Wallabag/ImportBundle/Resources/config/services.yml index e4dde100..55348ce7 100644 --- a/src/Wallabag/ImportBundle/Resources/config/services.yml +++ b/src/Wallabag/ImportBundle/Resources/config/services.yml | |||
@@ -18,6 +18,7 @@ services: | |||
18 | - "@doctrine.orm.entity_manager" | 18 | - "@doctrine.orm.entity_manager" |
19 | - "@wallabag_core.content_proxy" | 19 | - "@wallabag_core.content_proxy" |
20 | - %pocket_consumer_key% | 20 | - %pocket_consumer_key% |
21 | - "@translator" | ||
21 | calls: | 22 | calls: |
22 | - [ setClient, [ "@wallabag_import.pocket.client" ] ] | 23 | - [ setClient, [ "@wallabag_import.pocket.client" ] ] |
23 | - [ setLogger, [ "@logger" ]] | 24 | - [ setLogger, [ "@logger" ]] |
@@ -28,6 +29,7 @@ services: | |||
28 | class: Wallabag\ImportBundle\Import\WallabagV1Import | 29 | class: Wallabag\ImportBundle\Import\WallabagV1Import |
29 | arguments: | 30 | arguments: |
30 | - "@doctrine.orm.entity_manager" | 31 | - "@doctrine.orm.entity_manager" |
32 | - "@translator" | ||
31 | calls: | 33 | calls: |
32 | - [ setLogger, [ "@logger" ]] | 34 | - [ setLogger, [ "@logger" ]] |
33 | tags: | 35 | tags: |
diff --git a/src/Wallabag/ImportBundle/Resources/views/Import/index.html.twig b/src/Wallabag/ImportBundle/Resources/views/Import/index.html.twig index 27baa1e3..1f0addca 100644 --- a/src/Wallabag/ImportBundle/Resources/views/Import/index.html.twig +++ b/src/Wallabag/ImportBundle/Resources/views/Import/index.html.twig | |||
@@ -11,7 +11,7 @@ | |||
11 | <li> | 11 | <li> |
12 | <h5>{{ import.name }}</h5> | 12 | <h5>{{ import.name }}</h5> |
13 | <blockquote>{{ import.description|raw }}</blockquote> | 13 | <blockquote>{{ import.description|raw }}</blockquote> |
14 | <p><a class="waves-effect waves-light btn" href="{{ path(import.url) }}">Import contents</a></p> | 14 | <p><a class="waves-effect waves-light btn" href="{{ path(import.url) }}">{% trans %}Import contents{% endtrans %}</a></p> |
15 | </li> | 15 | </li> |
16 | {% endfor %} | 16 | {% endfor %} |
17 | </ul> | 17 | </ul> |
diff --git a/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig b/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig index 9803896c..58053780 100644 --- a/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig +++ b/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig | |||
@@ -9,7 +9,7 @@ | |||
9 | <p>{% 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 %}</p> | 9 | <p>{% 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 %}</p> |
10 | <form method="post" action="{{ path('import_pocket_auth') }}"> | 10 | <form method="post" action="{{ path('import_pocket_auth') }}"> |
11 | <button class="btn waves-effect waves-light" type="submit" name="action"> | 11 | <button class="btn waves-effect waves-light" type="submit" name="action"> |
12 | Connect to Pocket and import data | 12 | {% trans %}Connect to Pocket and import data{% endtrans %} |
13 | </button> | 13 | </button> |
14 | </form> | 14 | </form> |
15 | </div> | 15 | </div> |
diff --git a/src/Wallabag/ImportBundle/Resources/views/WallabagV1/index.html.twig b/src/Wallabag/ImportBundle/Resources/views/WallabagV1/index.html.twig index 23d3e146..afc57226 100644 --- a/src/Wallabag/ImportBundle/Resources/views/WallabagV1/index.html.twig +++ b/src/Wallabag/ImportBundle/Resources/views/WallabagV1/index.html.twig | |||
@@ -15,7 +15,7 @@ | |||
15 | <div class="file-field input-field col s12"> | 15 | <div class="file-field input-field col s12"> |
16 | {{ form_errors(form.file) }} | 16 | {{ form_errors(form.file) }} |
17 | <div class="btn"> | 17 | <div class="btn"> |
18 | <span>File</span> | 18 | <span>{% trans %}File{% endtrans %}</span> |
19 | {{ form_widget(form.file) }} | 19 | {{ form_widget(form.file) }} |
20 | </div> | 20 | </div> |
21 | <div class="file-path-wrapper"> | 21 | <div class="file-path-wrapper"> |