diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php index 6665f4b5b..c5a5a519c 100644 --- a/src/Wallabag/CoreBundle/Command/InstallCommand.php +++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php @@ -231,11 +231,6 @@ class InstallCommand extends ContainerAwareCommand $em->createQuery('DELETE FROM CraueConfigBundle:Setting')->execute(); $settings = [ - [ - 'name' => 'download_pictures', - 'value' => '1', - 'section' => 'entry', - ], [ 'name' => 'carrot', 'value' => '1', diff --git a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php index 1f4cafdfc..090587961 100644 --- a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php +++ b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php @@ -15,11 +15,6 @@ class LoadSettingData extends AbstractFixture implements OrderedFixtureInterface public function load(ObjectManager $manager) { $settings = [ - [ - 'name' => 'download_pictures', - 'value' => '1', - 'section' => 'entry', - ], [ 'name' => 'carrot', 'value' => '1', diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index 3dc229983..8f3e42673 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml @@ -176,7 +176,7 @@ entry: set_as_read: 'Mark as read' set_as_unread: 'Mark as unread' set_as_favorite: 'Favorite' - view_original_article: 'Orignal article' + view_original_article: 'Original article' re_fetch_content: 'Re-fetch content' delete: 'Delete' add_a_tag: 'Add a tag' diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig index 3cda3949e..5a8003323 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig @@ -22,7 +22,7 @@ {% if craue_setting('share_shaarli') %}
  • shaarli
  • {% endif %} {% if craue_setting('share_diaspora') %}
  • diaspora
  • {% endif %} {% if craue_setting('carrot') %}
  • Carrot
  • {% endif %} - {% if craue_setting('show_printlink') %}
  • {{ 'entry.view.left_menu.re_fetch_content'|trans }}
  • {% endif %} + {% if craue_setting('show_printlink') %}
  • {{ 'entry.view.left_menu.print'|trans }}
  • {% endif %} {% if craue_setting('export_epub') %}
  • EPUB
  • {% endif %} {% if craue_setting('export_mobi') %}
  • MOBI
  • {% endif %} {% if craue_setting('export_pdf') %}
  • PDF
  • {% endif %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig index 664356994..e89aea3a7 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig @@ -138,6 +138,17 @@ + {% if craue_setting('show_printlink') %} +
  • + + + {{ 'entry.view.left_menu.print'|trans }} + +
    +
  • + {% endif %} + +