aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml4
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml4
-rw-r--r--app/config/config.yml2
-rw-r--r--src/Wallabag/CoreBundle/Command/InstallCommand.php20
-rw-r--r--src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php20
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig14
6 files changed, 56 insertions, 8 deletions
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
index ea90460e..b5385dc3 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
@@ -4,6 +4,10 @@ diaspora_url: Diaspora URL, if the service is enabled
4export_epub: Enable ePub export 4export_epub: Enable ePub export
5export_mobi: Enable .mobi export 5export_mobi: Enable .mobi export
6export_pdf: Enable PDF export 6export_pdf: Enable PDF export
7export_csv: Enable CSV export
8export_json: Enable JSON export
9export_txt: Enable TXT export
10export_xml: Enable XML export
7pocket_consumer_key: Consumer key for Pocket to import contents (https://getpocket.com/developer/docs/authentication) 11pocket_consumer_key: Consumer key for Pocket to import contents (https://getpocket.com/developer/docs/authentication)
8shaarli_url: URL de Shaarli, if the service is enabled 12shaarli_url: URL de Shaarli, if the service is enabled
9share_diaspora: Enable share to Diaspora 13share_diaspora: Enable share to Diaspora
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
index 19600045..0efe14f4 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
@@ -4,6 +4,10 @@ diaspora_url: URL de Diaspora, si le service Diaspora est activé
4export_epub: Activer l'export ePub 4export_epub: Activer l'export ePub
5export_mobi: Activer l'export .mobi 5export_mobi: Activer l'export .mobi
6export_pdf: Activer l'export PDF 6export_pdf: Activer l'export PDF
7export_csv: Activer l'export CSV
8export_json: Activer l'export JSON
9export_txt: Activer l'export TXT
10export_xml: Activer l'export XML
7pocket_consumer_key: Clé d'authentification Pocket pour importer les données (https://getpocket.com/developer/docs/authentication) 11pocket_consumer_key: Clé d'authentification Pocket pour importer les données (https://getpocket.com/developer/docs/authentication)
8shaarli_url: URL de Shaarli, si le service Diaspora est activé 12shaarli_url: URL de Shaarli, si le service Diaspora est activé
9share_diaspora: Activer le partage vers Diaspora 13share_diaspora: Activer le partage vers Diaspora
diff --git a/app/config/config.yml b/app/config/config.yml
index 3c278ea6..dc6bccee 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -28,7 +28,7 @@ framework:
28 assets: ~ 28 assets: ~
29 29
30wallabag_core: 30wallabag_core:
31 version: 2.0.0-alpha.1 31 version: 2.0.0-alpha.2
32 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" 32 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
33 languages: 33 languages:
34 en: 'English' 34 en: 'English'
diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index 096f306f..93792692 100644
--- a/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@@ -273,6 +273,26 @@ class InstallCommand extends ContainerAwareCommand
273 'section' => 'export', 273 'section' => 'export',
274 ], 274 ],
275 [ 275 [
276 'name' => 'export_csv',
277 'value' => '1',
278 'section' => 'export',
279 ],
280 [
281 'name' => 'export_json',
282 'value' => '1',
283 'section' => 'export',
284 ],
285 [
286 'name' => 'export_txt',
287 'value' => '1',
288 'section' => 'export',
289 ],
290 [
291 'name' => 'export_xml',
292 'value' => '1',
293 'section' => 'export',
294 ],
295 [
276 'name' => 'pocket_consumer_key', 296 'name' => 'pocket_consumer_key',
277 'value' => null, 297 'value' => null,
278 'section' => 'import', 298 'section' => 'import',
diff --git a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php
index 8e3c7b59..5e89c2a9 100644
--- a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php
+++ b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php
@@ -71,6 +71,26 @@ class LoadSettingData extends AbstractFixture implements OrderedFixtureInterface
71 'section' => 'export', 71 'section' => 'export',
72 ], 72 ],
73 [ 73 [
74 'name' => 'export_csv',
75 'value' => '1',
76 'section' => 'export',
77 ],
78 [
79 'name' => 'export_json',
80 'value' => '1',
81 'section' => 'export',
82 ],
83 [
84 'name' => 'export_txt',
85 'value' => '1',
86 'section' => 'export',
87 ],
88 [
89 'name' => 'export_xml',
90 'value' => '1',
91 'section' => 'export',
92 ],
93 [
74 'name' => 'pocket_consumer_key', 94 'name' => 'pocket_consumer_key',
75 'value' => null, 95 'value' => null,
76 'section' => 'import', 96 'section' => 'import',
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 6de800b9..c86b8d88 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
@@ -99,13 +99,13 @@
99 {% endif %} 99 {% endif %}
100 <h4 class="center">{% trans %}Export{% endtrans %}</h4> 100 <h4 class="center">{% trans %}Export{% endtrans %}</h4>
101 <ul> 101 <ul>
102 {% if export_epub %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'epub' }) }}">{% trans %}EPUB{% endtrans %}</a></li>{% endif %} 102 {% if craue_setting('export_epub') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'epub' }) }}">{% trans %}EPUB{% endtrans %}</a></li>{% endif %}
103 {% if export_mobi %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'mobi' }) }}">{% trans %}MOBI{% endtrans %}</a></li>{% endif %} 103 {% if craue_setting('export_mobi') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'mobi' }) }}">{% trans %}MOBI{% endtrans %}</a></li>{% endif %}
104 {% if export_pdf %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'pdf' }) }}">{% trans %}PDF{% endtrans %}</a></li>{% endif %} 104 {% if craue_setting('export_pdf') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'pdf' }) }}">{% trans %}PDF{% endtrans %}</a></li>{% endif %}
105 {% if export_xml %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'xml' }) }}">{% trans %}XML{% endtrans %}</a></li>{% endif %} 105 {% if craue_setting('export_xml') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'xml' }) }}">{% trans %}XML{% endtrans %}</a></li>{% endif %}
106 {% if export_csv %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'json' }) }}">{% trans %}JSON{% endtrans %}</a></li>{% endif %} 106 {% if craue_setting('export_csv') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'json' }) }}">{% trans %}JSON{% endtrans %}</a></li>{% endif %}
107 {% if export_json %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'csv' }) }}">{% trans %}CSV{% endtrans %}</a></li>{% endif %} 107 {% if craue_setting('export_json') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'csv' }) }}">{% trans %}CSV{% endtrans %}</a></li>{% endif %}
108 {% if export_txt %}<li class="bold"><del><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'txt' }) }}">{% trans %}TXT{% endtrans %}</a></del></li>{% endif %} 108 {% if craue_setting('export_txt') %}<li class="bold"><del><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'txt' }) }}">{% trans %}TXT{% endtrans %}</a></del></li>{% endif %}
109 </ul> 109 </ul>
110 </div> 110 </div>
111 111