updated tests

src/Wallabag/ImportBundle/Import/PocketImport.php

@@ -11,7 +11,6 @@ use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInt
 use Wallabag\CoreBundle\Entity\Entry;
 use Wallabag\CoreBundle\Entity\Tag;
 use Wallabag\CoreBundle\Helper\ContentProxy;
-use Symfony\Component\Translation\TranslatorInterface;
 
 class PocketImport implements ImportInterface
 {
@@ -26,14 +25,13 @@ class PocketImport implements ImportInterface
     protected $accessToken;
     private $translator;
 
-    public function __construct(TokenStorageInterface $tokenStorage, EntityManager $em, ContentProxy $contentProxy, $consumerKey, TranslatorInterface $translator)
+    public function __construct(TokenStorageInterface $tokenStorage, EntityManager $em, ContentProxy $contentProxy, $consumerKey)
     {
         $this->user = $tokenStorage->getToken()->getUser();
         $this->em = $em;
         $this->contentProxy = $contentProxy;
         $this->consumerKey = $consumerKey;
         $this->logger = new NullLogger();
-        $this->translator = $translator;
     }
 
     public function setLogger(LoggerInterface $logger)
@@ -62,7 +60,7 @@ class PocketImport implements ImportInterface
      */
     public function getDescription()
     {
-        return $this->translator->trans("This importer will import all your <a href=\"https://getpocket.com\">Pocket</a> data. Pocket doesn't allow us to retrieve content from their service, so the readable content of each article will be re-fetched by wallabag.");
+        return 'This importer will import all your Pocket data. Pocket doesn\'t allow us to retrieve content from their service, so the readable content of each article will be re-fetched by wallabag.';
     }
 
     /**

src/Wallabag/ImportBundle/Import/WallabagV1Import.php

@@ -5,7 +5,6 @@ namespace Wallabag\ImportBundle\Import;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 use Doctrine\ORM\EntityManager;
-use Symfony\Component\Translation\TranslatorInterface;
 use Wallabag\CoreBundle\Entity\Entry;
 use Wallabag\UserBundle\Entity\User;
 use Wallabag\CoreBundle\Tools\Utils;
@@ -18,13 +17,11 @@ class WallabagV1Import implements ImportInterface
     private $skippedEntries = 0;
     private $importedEntries = 0;
     private $filepath;
-    private $translator;
 
-    public function __construct(EntityManager $em, TranslatorInterface $translator)
+    public function __construct(EntityManager $em)
     {
         $this->em = $em;
         $this->logger = new NullLogger();
-        $this->translator = $translator;
     }
 
     public function setLogger(LoggerInterface $logger)
@@ -66,7 +63,7 @@ class WallabagV1Import implements ImportInterface
      */
     public function getDescription()
     {
-        return $this->translator->trans('This importer will import all your wallabag v1 articles. On your config page, click on "JSON export" in the "Export your wallabag data" section. You will have a "wallabag-export-1-xxxx-xx-xx.json" file.');
+        return 'This importer will import all your wallabag v1 articles. On your config page, click on "JSON export" in the "Export your wallabag data" section. You will have a "wallabag-export-1-xxxx-xx-xx.json" file.';
     }
 
     /**

src/Wallabag/ImportBundle/Resources/config/services.yml

@@ -18,7 +18,6 @@ services:
             - "@doctrine.orm.entity_manager"
             - "@wallabag_core.content_proxy"
             - %pocket_consumer_key%
-            - "@translator"
         calls:
             - [ setClient, [ "@wallabag_import.pocket.client" ] ]
             - [ setLogger, [ "@logger" ]]
@@ -29,7 +28,6 @@ services:
         class: Wallabag\ImportBundle\Import\WallabagV1Import
         arguments:
             - "@doctrine.orm.entity_manager"
-            - "@translator"
         calls:
             - [ setLogger, [ "@logger" ]]
         tags:

src/Wallabag/ImportBundle/Resources/views/Import/index.html.twig

@@ -10,7 +10,7 @@
                 {% for import in imports %}
                     <li>
                         <h5>{{ import.name }}</h5>
-                        <blockquote>{{ import.description|raw }}</blockquote>
+                        <blockquote>{{ import.description|trans }}</blockquote>
                         <p><a class="waves-effect waves-light btn" href="{{ path(import.url) }}">{% trans %}Import contents{% endtrans %}</a></p>
                     </li>
                 {% endfor %}

src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig

@@ -5,7 +5,7 @@
 <div class="row">
     <div class="col s12">
         <div class="card-panel settings">
-            <blockquote>{{ import.description|raw }}</blockquote>
+            <blockquote>{{ import.description|trans }}</blockquote>
             <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>
             <form method="post" action="{{ path('import_pocket_auth') }}">
                 <button class="btn waves-effect waves-light" type="submit" name="action">

src/Wallabag/ImportBundle/Resources/views/WallabagV1/index.html.twig

@@ -6,7 +6,7 @@
     <div class="col s12">
         <div class="card-panel settings">
             <div class="row">
-                <blockquote>{{ import.description|raw }}</blockquote>
+                <blockquote>{{ import.description|trans }}</blockquote>
                 <p>{% trans %}Please select your wallabag export and click on the below button to upload and import it.{% endtrans %}</p>
                 <div class="col s12">
                     {{ form_start(form, {'method': 'POST'}) }}

src/Wallabag/ImportBundle/Tests/Import/PocketImportTest.php

@@ -75,7 +75,7 @@ class PocketImportTest extends \PHPUnit_Framework_TestCase
 
         $this->assertEquals('Pocket', $pocketImport->getName());
         $this->assertNotEmpty($pocketImport->getUrl());
-        $this->assertContains('This importer will import all your <a href="https://getpocket.com">Pocket</a> data.', $pocketImport->getDescription());
+        $this->assertContains('This importer will import all your Pocket data.', $pocketImport->getDescription());
     }
 
     public function testOAuthRequest()

src/Wallabag/ImportBundle/Tests/Import/WallabagV1ImportTest.php

@@ -38,7 +38,7 @@ class WallabagV1ImportTest extends \PHPUnit_Framework_TestCase
     {
         $wallabagV1Import = $this->getWallabagV1Import();
 
-        $this->assertEquals('Wallabag v1', $wallabagV1Import->getName());
+        $this->assertEquals('wallabag v1', $wallabagV1Import->getName());
         $this->assertNotEmpty($wallabagV1Import->getUrl());
         $this->assertContains('This importer will import all your wallabag v1 articles.', $wallabagV1Import->getDescription());
     }