Add translations & migration

3 files changed, 7 insertions, 35 deletions

diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index aedccfe4..9fe90357 100644
--- a/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@@ -370,7 +370,7 @@ class InstallCommand extends ContainerAwareCommand
             ],
             [
                 'name' => 'wallabag_url',
-                'value' => 'http://v2.wallabag.org',
+                'value' => '',
                 'section' => 'misc',
             ],
             [
@@ -401,17 +401,7 @@ class InstallCommand extends ContainerAwareCommand
             [
                 'name' => 'download_images_enabled',
                 'value' => '0',
-                'section' => 'image',
-            ],
-            [
-                'name' => 'download_images_with_rabbitmq',
-                'value' => '0',
-                'section' => 'image',
-            ],
-            [
-                'name' => 'download_images_with_redis',
-                'value' => '0',
-                'section' => 'image',
+                'section' => 'misc',
             ],
         ];
 
diff --git a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php
index 70a7a4ac..d0085660 100644
--- a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php
+++ b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php
@@ -143,17 +143,7 @@ class LoadSettingData extends AbstractFixture implements OrderedFixtureInterface
             [
                 'name' => 'download_images_enabled',
                 'value' => '0',
-                'section' => 'image',
-            ],
-            [
-                'name' => 'download_images_with_rabbitmq',
-                'value' => '0',
-                'section' => 'image',
-            ],
-            [
-                'name' => 'download_images_with_redis',
-                'value' => '0',
-                'section' => 'image',
+                'section' => 'misc',
             ],
         ];
 
diff --git a/src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php b/src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php
index 3f2d460c..6fddcea9 100644
--- a/src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php
+++ b/src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php
@@ -111,6 +111,8 @@ class DownloadImagesSubscriber implements EventSubscriber
     /**
      * Download all images from the html.
      *
+     * @todo If we want to add async download, it should be done in that method
+     *
      * @param Config $config
      * @param Entry  $entry
      *
@@ -120,12 +122,6 @@ class DownloadImagesSubscriber implements EventSubscriber
     {
         $this->downloadImages->setWallabagUrl($config->get('wallabag_url'));
 
-        // if ($config->get('download_images_with_rabbitmq')) {
-
-        // } else if ($config->get('download_images_with_redis')) {
-
-        // }
-
         return $this->downloadImages->processHtml(
             $entry->getContent(),
             $entry->getUrl()
@@ -135,6 +131,8 @@ class DownloadImagesSubscriber implements EventSubscriber
     /**
      * Download the preview picture.
      *
+     * @todo If we want to add async download, it should be done in that method
+     *
      * @param Config $config
      * @param Entry  $entry
      *
@@ -144,12 +142,6 @@ class DownloadImagesSubscriber implements EventSubscriber
     {
         $this->downloadImages->setWallabagUrl($config->get('wallabag_url'));
 
-        // if ($config->get('download_images_with_rabbitmq')) {
-
-        // } else if ($config->get('download_images_with_redis')) {
-
-        // }
-
         return $this->downloadImages->processSingleImage(
             $entry->getPreviewPicture(),
             $entry->getUrl()