oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-07-22 17:18:37 +00:00
Code Wiki Activity

Add translations & migration

Browse source
This commit is contained in:
Jeremy Benoist 2016-10-31 13:29:33 +01:00
parent d1495dd0a4
commit aedd6ca0fd
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
15 changed files with 62 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/Wallabag/CoreBundle/Command/InstallCommand.php
View file

@ -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',
],
];

12
src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php
View file

@ -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',
],
];

16
src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php
View file

@ -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()