aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/ImportBundle/Resources
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-01-06 06:34:57 +0100
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2016-01-07 21:00:04 +0100
commitb88cf91fc8371194df78e690983c61ea94f266cd (patch)
treeea9d934eb7a593de8cd69ea28e014a44702b23c7 /src/Wallabag/ImportBundle/Resources
parentd1af8ad4dbf7f3ce5170655c2fa8403406283039 (diff)
downloadwallabag-b88cf91fc8371194df78e690983c61ea94f266cd.tar.gz
wallabag-b88cf91fc8371194df78e690983c61ea94f266cd.tar.zst
wallabag-b88cf91fc8371194df78e690983c61ea94f266cd.zip
updated tests
Diffstat (limited to 'src/Wallabag/ImportBundle/Resources')
-rw-r--r--src/Wallabag/ImportBundle/Resources/config/services.yml2
-rw-r--r--src/Wallabag/ImportBundle/Resources/views/Import/index.html.twig2
-rw-r--r--src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig2
-rw-r--r--src/Wallabag/ImportBundle/Resources/views/WallabagV1/index.html.twig2
4 files changed, 3 insertions, 5 deletions
diff --git a/src/Wallabag/ImportBundle/Resources/config/services.yml b/src/Wallabag/ImportBundle/Resources/config/services.yml
index 55348ce7..e4dde100 100644
--- a/src/Wallabag/ImportBundle/Resources/config/services.yml
+++ b/src/Wallabag/ImportBundle/Resources/config/services.yml
@@ -18,7 +18,6 @@ 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"
22 calls: 21 calls:
23 - [ setClient, [ "@wallabag_import.pocket.client" ] ] 22 - [ setClient, [ "@wallabag_import.pocket.client" ] ]
24 - [ setLogger, [ "@logger" ]] 23 - [ setLogger, [ "@logger" ]]
@@ -29,7 +28,6 @@ services:
29 class: Wallabag\ImportBundle\Import\WallabagV1Import 28 class: Wallabag\ImportBundle\Import\WallabagV1Import
30 arguments: 29 arguments:
31 - "@doctrine.orm.entity_manager" 30 - "@doctrine.orm.entity_manager"
32 - "@translator"
33 calls: 31 calls:
34 - [ setLogger, [ "@logger" ]] 32 - [ setLogger, [ "@logger" ]]
35 tags: 33 tags:
diff --git a/src/Wallabag/ImportBundle/Resources/views/Import/index.html.twig b/src/Wallabag/ImportBundle/Resources/views/Import/index.html.twig
index 1f0addca..303e6cbf 100644
--- a/src/Wallabag/ImportBundle/Resources/views/Import/index.html.twig
+++ b/src/Wallabag/ImportBundle/Resources/views/Import/index.html.twig
@@ -10,7 +10,7 @@
10 {% for import in imports %} 10 {% for import in imports %}
11 <li> 11 <li>
12 <h5>{{ import.name }}</h5> 12 <h5>{{ import.name }}</h5>
13 <blockquote>{{ import.description|raw }}</blockquote> 13 <blockquote>{{ import.description|trans }}</blockquote>
14 <p><a class="waves-effect waves-light btn" href="{{ path(import.url) }}">{% trans %}Import contents{% endtrans %}</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 %}
diff --git a/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig b/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
index 58053780..643ad775 100644
--- a/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
+++ b/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
@@ -5,7 +5,7 @@
5<div class="row"> 5<div class="row">
6 <div class="col s12"> 6 <div class="col s12">
7 <div class="card-panel settings"> 7 <div class="card-panel settings">
8 <blockquote>{{ import.description|raw }}</blockquote> 8 <blockquote>{{ import.description|trans }}</blockquote>
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">
diff --git a/src/Wallabag/ImportBundle/Resources/views/WallabagV1/index.html.twig b/src/Wallabag/ImportBundle/Resources/views/WallabagV1/index.html.twig
index afc57226..1359f2e4 100644
--- a/src/Wallabag/ImportBundle/Resources/views/WallabagV1/index.html.twig
+++ b/src/Wallabag/ImportBundle/Resources/views/WallabagV1/index.html.twig
@@ -6,7 +6,7 @@
6 <div class="col s12"> 6 <div class="col s12">
7 <div class="card-panel settings"> 7 <div class="card-panel settings">
8 <div class="row"> 8 <div class="row">
9 <blockquote>{{ import.description|raw }}</blockquote> 9 <blockquote>{{ import.description|trans }}</blockquote>
10 <p>{% trans %}Please select your wallabag export and click on the below button to upload and import it.{% endtrans %}</p> 10 <p>{% trans %}Please select your wallabag export and click on the below button to upload and import it.{% endtrans %}</p>
11 <div class="col s12"> 11 <div class="col s12">
12 {{ form_start(form, {'method': 'POST'}) }} 12 {{ form_start(form, {'method': 'POST'}) }}