From 6824914eb5bf28aa5b7ca0f0a2cb610d287948be Mon Sep 17 00:00:00 2001 From: Kevin Decherf Date: Tue, 3 May 2022 13:44:20 +0200 Subject: [PATCH 1/2] Deprecate mobi export - Disable mobi export on new installations - Put a note in the setting label Closes #5773 Signed-off-by: Kevin Decherf --- .../CraueConfigBundle/translations/CraueConfigBundle.en.yml | 2 +- .../CraueConfigBundle/translations/CraueConfigBundle.fr.yml | 2 +- app/config/wallabag.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml index 4b3800aef..d88fc2b0c 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml @@ -3,7 +3,7 @@ download_pictures: Download pictures onto your server carrot: Enable share to Carrot diaspora_url: diaspora* URL, if the service is enabled export_epub: Enable ePub export -export_mobi: Enable .mobi export +export_mobi: Enable .mobi export (deprecated, will be removed in 2.6.0) export_pdf: Enable PDF export export_csv: Enable CSV export export_json: Enable JSON export diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml index e598bf18b..0fd94bda9 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml @@ -3,7 +3,7 @@ download_pictures: Télécharger les images sur le serveur carrot: Activer le partage vers Carrot diaspora_url: URL de diaspora*, si le service est activé export_epub: Activer l'export ePub -export_mobi: Activer l'export .mobi +export_mobi: Activer l'export .mobi (déprécié, sera supprimé dans la 2.6.0) export_pdf: Activer l'export PDF export_csv: Activer l'export CSV export_json: Activer l'export JSON diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml index deda2b3ee..5e182c8e8 100644 --- a/app/config/wallabag.yml +++ b/app/config/wallabag.yml @@ -99,7 +99,7 @@ wallabag_core: section: export - name: export_mobi - value: 1 + value: 0 section: export - name: export_pdf From c87c91d3df1862ff50a082b58478386607fbc634 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Fri, 13 May 2022 09:56:35 +0200 Subject: [PATCH 2/2] Update message --- .../CraueConfigBundle/translations/CraueConfigBundle.en.yml | 2 +- .../CraueConfigBundle/translations/CraueConfigBundle.fr.yml | 2 +- .../Resources/views/themes/baggy/Entry/entries.html.twig | 2 +- .../Resources/views/themes/baggy/Entry/entry.html.twig | 2 +- .../Resources/views/themes/material/Entry/entries.html.twig | 2 +- .../Resources/views/themes/material/Entry/entry.html.twig | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml index d88fc2b0c..8c92aebdd 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml @@ -3,7 +3,7 @@ download_pictures: Download pictures onto your server carrot: Enable share to Carrot diaspora_url: diaspora* URL, if the service is enabled export_epub: Enable ePub export -export_mobi: Enable .mobi export (deprecated, will be removed in 2.6.0) +export_mobi: Enable .mobi export (deprecated, will be removed soon) export_pdf: Enable PDF export export_csv: Enable CSV export export_json: Enable JSON export diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml index 0fd94bda9..8f82781d5 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml @@ -3,7 +3,7 @@ download_pictures: Télécharger les images sur le serveur carrot: Activer le partage vers Carrot diaspora_url: URL de diaspora*, si le service est activé export_epub: Activer l'export ePub -export_mobi: Activer l'export .mobi (déprécié, sera supprimé dans la 2.6.0) +export_mobi: Activer l'export .mobi (déprécié, sera supprimé prochainement) export_pdf: Activer l'export PDF export_csv: Activer l'export CSV export_json: Activer l'export JSON diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig index 4182628f6..8dc6fd507 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig @@ -105,7 +105,7 @@ ×
    {% if craue_setting('export_epub') %}
  • EPUB
    • {% endif %} - {% if craue_setting('export_mobi') %}
  • MOBI
    • {% endif %} + {% if craue_setting('export_mobi') %}
  • MOBI (deprecated)
    • {% endif %} {% if craue_setting('export_pdf') %}
  • PDF
    • {% endif %} {% if craue_setting('export_json') %}
  • JSON
    • {% endif %} {% if craue_setting('export_csv') %}
  • CSV
    • {% endif %} 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 afae4c86d..42f33f54e 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 @@ -36,7 +36,7 @@ {% if craue_setting('carrot') %}
  • Carrot
    • {% 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_mobi') %}
  • MOBI (deprecated)
    • {% endif %} {% if craue_setting('export_pdf') %}
  • PDF
    • {% endif %}
  • {{ 'entry.view.left_menu.problem.label'|trans }}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig index c5dc97e01..b9662b1b2 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig @@ -92,7 +92,7 @@

{{ 'entry.list.export_title'|trans }}

    {% if craue_setting('export_epub') %}
  • EPUB
    • {% endif %} - {% if craue_setting('export_mobi') %}
  • MOBI
    • {% endif %} + {% if craue_setting('export_mobi') %}
  • MOBI (deprecated)
    • {% endif %} {% if craue_setting('export_pdf') %}
  • PDF
    • {% endif %} {% if craue_setting('export_json') %}
  • JSON
    • {% endif %} {% if craue_setting('export_csv') %}
  • CSV
    • {% 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 e81525529..ea79cf882 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 @@ -231,7 +231,7 @@
      {% if craue_setting('export_epub') %}
    • EPUB
      • {% endif %} - {% if craue_setting('export_mobi') %}
    • MOBI
      • {% endif %} + {% if craue_setting('export_mobi') %}
    • MOBI (deprecated)
      • {% endif %} {% if craue_setting('export_pdf') %}
    • PDF
      • {% endif %} {% if craue_setting('export_csv') %}
    • CSV
      • {% endif %} {% if craue_setting('export_json') %}
    • JSON
      • {% endif %}