aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/ImportBundle/Import
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-01-05 22:38:09 +0100
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2016-01-05 22:38:09 +0100
commitd1af8ad4dbf7f3ce5170655c2fa8403406283039 (patch)
treec8ba1d7f6c49a764b14f250b3125665c58ff68fa /src/Wallabag/ImportBundle/Import
parent8eedc8cfacc07e998f6f0bcdfe5b76496a215ea2 (diff)
downloadwallabag-d1af8ad4dbf7f3ce5170655c2fa8403406283039.tar.gz
wallabag-d1af8ad4dbf7f3ce5170655c2fa8403406283039.tar.zst
wallabag-d1af8ad4dbf7f3ce5170655c2fa8403406283039.zip
Added french translations
Diffstat (limited to 'src/Wallabag/ImportBundle/Import')
-rw-r--r--src/Wallabag/ImportBundle/Import/PocketImport.php7
-rw-r--r--src/Wallabag/ImportBundle/Import/WallabagV1Import.php9
2 files changed, 11 insertions, 5 deletions
diff --git a/src/Wallabag/ImportBundle/Import/PocketImport.php b/src/Wallabag/ImportBundle/Import/PocketImport.php
index 267c4af5..9b82720a 100644
--- a/src/Wallabag/ImportBundle/Import/PocketImport.php
+++ b/src/Wallabag/ImportBundle/Import/PocketImport.php
@@ -11,6 +11,7 @@ use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInt
11use Wallabag\CoreBundle\Entity\Entry; 11use Wallabag\CoreBundle\Entity\Entry;
12use Wallabag\CoreBundle\Entity\Tag; 12use Wallabag\CoreBundle\Entity\Tag;
13use Wallabag\CoreBundle\Helper\ContentProxy; 13use Wallabag\CoreBundle\Helper\ContentProxy;
14use Symfony\Component\Translation\TranslatorInterface;
14 15
15class PocketImport implements ImportInterface 16class PocketImport implements ImportInterface
16{ 17{
@@ -23,14 +24,16 @@ class PocketImport implements ImportInterface
23 private $skippedEntries = 0; 24 private $skippedEntries = 0;
24 private $importedEntries = 0; 25 private $importedEntries = 0;
25 protected $accessToken; 26 protected $accessToken;
27 private $translator;
26 28
27 public function __construct(TokenStorageInterface $tokenStorage, EntityManager $em, ContentProxy $contentProxy, $consumerKey) 29 public function __construct(TokenStorageInterface $tokenStorage, EntityManager $em, ContentProxy $contentProxy, $consumerKey, TranslatorInterface $translator)
28 { 30 {
29 $this->user = $tokenStorage->getToken()->getUser(); 31 $this->user = $tokenStorage->getToken()->getUser();
30 $this->em = $em; 32 $this->em = $em;
31 $this->contentProxy = $contentProxy; 33 $this->contentProxy = $contentProxy;
32 $this->consumerKey = $consumerKey; 34 $this->consumerKey = $consumerKey;
33 $this->logger = new NullLogger(); 35 $this->logger = new NullLogger();
36 $this->translator = $translator;
34 } 37 }
35 38
36 public function setLogger(LoggerInterface $logger) 39 public function setLogger(LoggerInterface $logger)
@@ -59,7 +62,7 @@ class PocketImport implements ImportInterface
59 */ 62 */
60 public function getDescription() 63 public function getDescription()
61 { 64 {
62 return '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.'; 65 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.");
63 } 66 }
64 67
65 /** 68 /**
diff --git a/src/Wallabag/ImportBundle/Import/WallabagV1Import.php b/src/Wallabag/ImportBundle/Import/WallabagV1Import.php
index 0866ebe9..68f0574f 100644
--- a/src/Wallabag/ImportBundle/Import/WallabagV1Import.php
+++ b/src/Wallabag/ImportBundle/Import/WallabagV1Import.php
@@ -5,6 +5,7 @@ namespace Wallabag\ImportBundle\Import;
5use Psr\Log\LoggerInterface; 5use Psr\Log\LoggerInterface;
6use Psr\Log\NullLogger; 6use Psr\Log\NullLogger;
7use Doctrine\ORM\EntityManager; 7use Doctrine\ORM\EntityManager;
8use Symfony\Component\Translation\TranslatorInterface;
8use Wallabag\CoreBundle\Entity\Entry; 9use Wallabag\CoreBundle\Entity\Entry;
9use Wallabag\UserBundle\Entity\User; 10use Wallabag\UserBundle\Entity\User;
10use Wallabag\CoreBundle\Tools\Utils; 11use Wallabag\CoreBundle\Tools\Utils;
@@ -17,11 +18,13 @@ class WallabagV1Import implements ImportInterface
17 private $skippedEntries = 0; 18 private $skippedEntries = 0;
18 private $importedEntries = 0; 19 private $importedEntries = 0;
19 private $filepath; 20 private $filepath;
21 private $translator;
20 22
21 public function __construct(EntityManager $em) 23 public function __construct(EntityManager $em, TranslatorInterface $translator)
22 { 24 {
23 $this->em = $em; 25 $this->em = $em;
24 $this->logger = new NullLogger(); 26 $this->logger = new NullLogger();
27 $this->translator = $translator;
25 } 28 }
26 29
27 public function setLogger(LoggerInterface $logger) 30 public function setLogger(LoggerInterface $logger)
@@ -47,7 +50,7 @@ class WallabagV1Import implements ImportInterface
47 */ 50 */
48 public function getName() 51 public function getName()
49 { 52 {
50 return 'Wallabag v1'; 53 return 'wallabag v1';
51 } 54 }
52 55
53 /** 56 /**
@@ -63,7 +66,7 @@ class WallabagV1Import implements ImportInterface
63 */ 66 */
64 public function getDescription() 67 public function getDescription()
65 { 68 {
66 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.'; 69 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.');
67 } 70 }
68 71
69 /** 72 /**