aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeremy Benoist <j0k3r@users.noreply.github.com>2016-01-15 16:01:13 +0100
committerJeremy Benoist <j0k3r@users.noreply.github.com>2016-01-15 16:01:13 +0100
commitf902d7815326e81913904257cc4485b4dfef5d13 (patch)
tree2aa1edbfccf2c19d47b815481192972cb8eb248a
parent86719c63bf47686ca55020e6b0443344de36d45a (diff)
parentb91465c067c17eec0d8dfc22c84f58421579709c (diff)
downloadwallabag-f902d7815326e81913904257cc4485b4dfef5d13.tar.gz
wallabag-f902d7815326e81913904257cc4485b4dfef5d13.tar.zst
wallabag-f902d7815326e81913904257cc4485b4dfef5d13.zip
Merge pull request #1564 from wallabag/v2-remove-flattr
Remove Flattr references
-rw-r--r--app/config/config.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.de.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml3
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig2
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig2
5 files changed, 1 insertions, 8 deletions
diff --git a/app/config/config.yml b/app/config/config.yml
index 19e7155d..23262469 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -60,7 +60,6 @@ twig:
60 twofactor_auth: %twofactor_auth% 60 twofactor_auth: %twofactor_auth%
61 warning_message: %warning_message% 61 warning_message: %warning_message%
62 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" 62 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
63 flattr_url: "https://flattr.com/thing/1265480"
64 form_themes: 63 form_themes:
65 - "LexikFormFilterBundle:Form:form_div_layout.html.twig" 64 - "LexikFormFilterBundle:Form:form_div_layout.html.twig"
66 65
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index b9818827..8b75594c 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -93,7 +93,6 @@ or: "oder"
93"by contributing to the project:": "indem du zu dem Projekt beiträgst:" 93"by contributing to the project:": "indem du zu dem Projekt beiträgst:"
94an issue lists all our needs: "ein Issue listet alle unsere Bedürfnisse:" 94an issue lists all our needs: "ein Issue listet alle unsere Bedürfnisse:"
95via Paypal: "via PayPal" 95via Paypal: "via PayPal"
96via Flattr: "via Flattr"
97 96
98# Howto 97# Howto
99Form: Formular 98Form: Formular
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 941237bf..20f4352b 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -94,7 +94,6 @@ or: "ou"
94"by contributing to the project:": "en contribuant au projet :" 94"by contributing to the project:": "en contribuant au projet :"
95an issue lists all our needs: "un ticket recense tous nos besoins" 95an issue lists all our needs: "un ticket recense tous nos besoins"
96via Paypal: "via Paypal" 96via Paypal: "via Paypal"
97via Flattr: "via Flattr"
98 97
99# Howto 98# Howto
100Form: "Formulaire" 99Form: "Formulaire"
@@ -163,4 +162,4 @@ Support: "Support"
163If you need some help, we are here for you.: "Parce que vous avez peut-être besoin de nous poser une question, nous sommes disponibles pour vous." 162If you need some help, we are here for you.: "Parce que vous avez peut-être besoin de nous poser une question, nous sommes disponibles pour vous."
164On GitHub: "Sur GitHub" 163On GitHub: "Sur GitHub"
165By email: "Par email" 164By email: "Par email"
166On Gitter: "Sur Gitter" \ No newline at end of file 165On Gitter: "Sur Gitter"
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig
index 311b5067..38f08da6 100755
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig
@@ -41,7 +41,5 @@
41 <dt>{% trans %}wallabag is free and opensource. You can help us:{% endtrans %}</dt> 41 <dt>{% trans %}wallabag is free and opensource. You can help us:{% endtrans %}</dt>
42 <dd>by contributing to the project: <a href="https://github.com/wallabag/wallabag/issues/1254">an issue lists all our needs</a></dd> 42 <dd>by contributing to the project: <a href="https://github.com/wallabag/wallabag/issues/1254">an issue lists all our needs</a></dd>
43 <dd><a href="{{ paypal_url }}">{% trans %}via Paypal{% endtrans %}</a></dd> 43 <dd><a href="{{ paypal_url }}">{% trans %}via Paypal{% endtrans %}</a></dd>
44
45 <dd><a href="{{ flattr_url }}">{% trans %}via Flattr{% endtrans %}</a></dd>
46 </dl> 44 </dl>
47{% endblock %} 45{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig
index ef1fe916..d6b8e28a 100755
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig
@@ -46,8 +46,6 @@
46 <dt>{% trans %}wallabag is free and opensource. You can help us:{% endtrans %}</dt> 46 <dt>{% trans %}wallabag is free and opensource. You can help us:{% endtrans %}</dt>
47 <dd>{% trans %}by contributing to the project:{% endtrans %} <a href="https://github.com/wallabag/wallabag/issues/1254">{% trans %}an issue lists all our needs{% endtrans %}</a></dd> 47 <dd>{% trans %}by contributing to the project:{% endtrans %} <a href="https://github.com/wallabag/wallabag/issues/1254">{% trans %}an issue lists all our needs{% endtrans %}</a></dd>
48 <dd><a href="{{ paypal_url }}">{% trans %}via Paypal{% endtrans %}</a></dd> 48 <dd><a href="{{ paypal_url }}">{% trans %}via Paypal{% endtrans %}</a></dd>
49
50 <dd><a href="{{ flattr_url }}">{% trans %}via Flattr{% endtrans %}</a></dd>
51 </dl> 49 </dl>
52 </div> 50 </div>
53 51