From: Michael Tremer Date: Tue, 23 Oct 2012 09:30:20 +0000 (+0200) Subject: wishlist: Make the reason for transfer things more clear. X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=353880e5027d1e8e720faa637472a4479f9d0f43;p=ipfire.org.git wishlist: Make the reason for transfer things more clear. --- diff --git a/www/templates/modules/donation-box.html b/www/templates/modules/donation-box.html index 9087cb05..7c5ba4af 100644 --- a/www/templates/modules/donation-box.html +++ b/www/templates/modules/donation-box.html @@ -9,7 +9,7 @@
{% if lang == "de" %}

- PayPal ist unser bevorzugter und gleichzeig einfachster Weg um zu spenden. + PayPal ist unser bevorzugter und gleichzeitig einfachster Weg zu spenden. Dazu einfach auf den Button klicken und den gewünschten Betrag eingeben.

@@ -17,6 +17,9 @@
+ {% if reason_for_transfer %} + + {% end %}
@@ -32,6 +35,9 @@
+ {% if reason_for_transfer %} + + {% end %}
@@ -53,51 +59,41 @@

Ebenso ist eine Spende auf unser Bankkonto möglich.

- -
-
-

Euro-Überweisung/SEPA

- -
- IBAN: DE86 4265 0150 1020 0768 89
- BIC-/SWIFT-Code: WELADED1REK -
-
- -
-

Überweisung innerhalb Deutschlands

-
- Kontoinhaber: Michael Tremer
- Kontonummer: 1020076889
- Bankleitzahl: 426 501 50 -
-
-
{% else %}

It is also possible to transfer donations into our bank account.

+ {% end %} -
-
-

euro bank transfer

-
- IBAN: DE86 4265 0150 1020 0768 89
- BIC-/SWIFT-Code: WELADED1REK +
+
+

{{ _("euro bank transfer") }}

+
+ {{ _("IBAN") }}: DE86 4265 0150 1020 0768 89
+ {{ _("BIC-/SWIFT-Code") }}: WELADED1REK + {% if reason_for_transfer %} +
+ {{ _("Reason for transfer") }}: + {{ reason_for_transfer }} + {% end %}
-
+
-
-

bank transfer within Germany

-
- Bank account owner: Michael Tremer
- Bank account number: 1020076889
- Bank code: 426 501 50 -
-
+
+

{{ _("bank transfer within Germany") }}

+
+ {{ _("Bank account owner") }}: Michael Tremer
+ {{ _("Bank account number") }}: 1020076889
+ {{ _("Bank code") }}: 426 501 50 + {% if reason_for_transfer %} +
+ {{ _("Reason for transfer") }}: + {{ reason_for_transfer }} + {% end %} +
- {% end %} +
diff --git a/www/templates/static/donation.html b/www/templates/static/donation.html index 152ecba1..5c25fc83 100644 --- a/www/templates/static/donation.html +++ b/www/templates/static/donation.html @@ -7,61 +7,58 @@

{{ _("Donation") }}

-
-
- {% if lang == "de" %} -

- IPFire ist ein Open Source-Projekt. - Nutzer und die Gemeinschaft sind das wertvollste und wichtigste - Gut, weil sich das Projekt auf sie stützt. - Die Entwicklung und die Fortführung des Projekts sind allein - einer Gruppe von Freiwilligen zu verdanken. - Sie haben ein Produkt entwickelt, das tagtäglich von - Hunderttausenden genutzt wird. -

-

- Um die Qualität von IPFire noch weiter verbessern zu können, - sowie Aktivitäten des Projekts auszuweiten und die Verbreitung - zu steigern, sind finanzielle Mittel unabdingbar. - Jeder Sponsor kann seinen Teil dazu beitragen, diese Ziele - zu erreichen, das Projekt finanziell gesund zu erhalten und - somit langfristig abzusichern. -

-

- Deshalb ermutigen wir jeden, der IPFire einsetzt einen Beitrag zu leisten. - Danke dafür. -

- {% else %} -

- IPFire is an Open Source project. - The users and the community are the most valuable and most important factor, - because those people are the foundation of the project. - Development and keeping the project healthy is carried out by a group of volunteers, - that in time have built a very successful product, - which hundreds of thousands of people use every day. - We appreciate every bit of feedback, every bug report, patch and contribution. -

-

- We would like to extend our activities and improve the quality of IPFire even more. - For that, we will need financial resources to support the maintenance, - improvement and promotion of the IPFire project. - Sponsorship is a good way to ensure the longevity and overall health of the project. -

- So we encourage anyone who downloads and uses IPFire to donate. - It is very much appreciated. -

- {% end %} -
-
+ {% if lang == "de" %} +

+ IPFire ist ein Open Source-Projekt. + Nutzer und die Gemeinschaft sind das wertvollste und wichtigste + Gut, weil sich das Projekt auf sie stützt. + Die Entwicklung und die Fortführung des Projekts sind allein + einer Gruppe von Freiwilligen zu verdanken. + Sie haben ein Produkt entwickelt, das tagtäglich von + Hunderttausenden genutzt wird. +

+

+ Um die Qualität von IPFire noch weiter verbessern zu können, + sowie Aktivitäten des Projekts auszuweiten und die Verbreitung + zu steigern, sind finanzielle Mittel unabdingbar. + Jeder Sponsor kann seinen Teil dazu beitragen, diese Ziele + zu erreichen, das Projekt finanziell gesund zu erhalten und + somit langfristig abzusichern. +

+

+ Deshalb ermutigen wir jeden, der IPFire einsetzt einen Beitrag zu leisten. + Danke dafür. +

+ {% else %} +

+ IPFire is an Open Source project. + The users and the community are the most valuable and most important factor, + because those people are the foundation of the project. + Development and keeping the project healthy is carried out by a group of volunteers, + that in time have built a very successful product, + which hundreds of thousands of people use every day. + We appreciate every bit of feedback, every bug report, patch and contribution. +

+

+ We would like to extend our activities and improve the quality of IPFire even more. + For that, we will need financial resources to support the maintenance, + improvement and promotion of the IPFire project. + Sponsorship is a good way to ensure the longevity and overall health of the project. +

+

+ So we encourage anyone who downloads and uses IPFire to donate. + It is very much appreciated. +

+ {% end %}
-
+
{{ modules.DonationBox() }} -
-
{{ _("Did you know...?") }}
+
+ {{ _("Did you know...?") }} {% if lang == "de" %} Du kannst die Implementierung deiner bevorzugten Funktion mit Hilfe einer Spende auf der diff --git a/www/templates/wishlist/donate.html b/www/templates/wishlist/donate.html index 0588f179..f3290598 100644 --- a/www/templates/wishlist/donate.html +++ b/www/templates/wishlist/donate.html @@ -7,53 +7,32 @@

{{ wish.title }}

-
-
- {% if lang == "de" %} -

- Bevor du mit deiner Spende fortfährst, lies bitte die - {{ _("Terms & Conditions") }}. - Solltest du mit diesen nicht einverstanden sein, - fahre nicht weiter fort. -

- {% else %} -

- Before you make your donation, make sure that you - have read the {{ _("Terms & Conditions") }}. - In case you don't agree to them, please stop right here. -

- {% end %} - - {% if lang == "de" %} -

- Um fortzufahren, wähle eine der Bezahlmethoden aus und - - stelle sicher, dass du den nebenstehenden Verwendungszweck mit angibst. - -

- {% else %} -

- To go on, please pick one of the methods below to make your donation. - - Make sure that you state the reason you are donating in the comment box with your donation. - -

- {% end %} -
- -
-
-

{{ _("Reason for transfer") }}

- {{ wish.tag }} -
-
-
+ {% if lang == "de" %} +

+ Bevor du mit deiner Spende fortfährst, lies bitte die + {{ _("Terms & Conditions") }}. + Solltest du mit diesen nicht einverstanden sein, + fahre nicht weiter fort. +

+

+ Wähle dann deine präferierte Bezahlmethode aus, um deine Spende zu tätigen. +

+ {% else %} +

+ Before you make your donation, make sure that you + have read the {{ _("Terms & Conditions") }}. + In case you don't agree to them, please stop right here. +

+

+ To go on, please pick one of the methods below to make your donation. +

+ {% end %}
-
- {{ modules.DonationBox() }} +
+ {{ modules.DonationBox(wish.tag) }}
{% end block %} diff --git a/www/translations/de_DE/LC_MESSAGES/webapp.po b/www/translations/de_DE/LC_MESSAGES/webapp.po index c8d6c478..c120aa05 100644 --- a/www/translations/de_DE/LC_MESSAGES/webapp.po +++ b/www/translations/de_DE/LC_MESSAGES/webapp.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-10-21 19:41+0200\n" +"POT-Creation-Date: 2012-10-23 11:20+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -79,16 +79,12 @@ msgstr "Startseite" msgid "Crowd funding for the IPFire project" msgstr "Crowdfunding für das IPFire-Projekt" -#: templates/wishlist/donate.html:15 templates/wishlist/donate.html:22 +#: templates/wishlist/donate.html:15 templates/wishlist/donate.html:25 #: templates/wishlist/terms.html:3 templates/wishlist/terms.html:7 #: templates/base.html:74 msgid "Terms & Conditions" msgstr "Allgemeine Bedingungen" -#: templates/wishlist/donate.html:42 -msgid "Reason for transfer" -msgstr "Verwendungszweck" - #: templates/downloads-index.html:3 msgid "Download Center" msgstr "Downloadcenter" @@ -933,10 +929,43 @@ msgstr "Error" msgid "Donate with PayPal or Credit Card" msgstr "Mit PayPal oder Kreditkarte spenden" -#: templates/modules/donation-box.html:47 +#: templates/modules/donation-box.html:53 msgid "Bank Transfer" msgstr "Banküberweisung" +#: templates/modules/donation-box.html:71 +msgid "euro bank transfer" +msgstr "Europa-Banküberweisung" + +#: templates/modules/donation-box.html:73 +msgid "IBAN" +msgstr "IBAN" + +#: templates/modules/donation-box.html:74 +msgid "BIC-/SWIFT-Code" +msgstr "BIC-/SWIFT-Code" + +#: templates/modules/donation-box.html:77 +#: templates/modules/donation-box.html:91 +msgid "Reason for transfer" +msgstr "Verwendungszweck" + +#: templates/modules/donation-box.html:84 +msgid "bank transfer within Germany" +msgstr "Überweisung innerhalb Deutschlands" + +#: templates/modules/donation-box.html:86 +msgid "Bank account owner" +msgstr "Kontoinhaber" + +#: templates/modules/donation-box.html:87 +msgid "Bank account number" +msgstr "Kontonummer" + +#: templates/modules/donation-box.html:88 +msgid "Bank code" +msgstr "BLZ" + #: templates/modules/release-item.html:2 #: templates/modules/sidebar-release.html:4 templates/index.html:24 #: templates/index.html:47 diff --git a/www/translations/webapp.pot b/www/translations/webapp.pot index 76dfe4b0..5807bc04 100644 --- a/www/translations/webapp.pot +++ b/www/translations/webapp.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-10-21 19:41+0200\n" +"POT-Creation-Date: 2012-10-23 11:20+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -78,16 +78,12 @@ msgstr "" msgid "Crowd funding for the IPFire project" msgstr "" -#: templates/wishlist/donate.html:15 templates/wishlist/donate.html:22 +#: templates/wishlist/donate.html:15 templates/wishlist/donate.html:25 #: templates/wishlist/terms.html:3 templates/wishlist/terms.html:7 #: templates/base.html:74 msgid "Terms & Conditions" msgstr "" -#: templates/wishlist/donate.html:42 -msgid "Reason for transfer" -msgstr "" - #: templates/downloads-index.html:3 msgid "Download Center" msgstr "" @@ -924,10 +920,43 @@ msgstr "" msgid "Donate with PayPal or Credit Card" msgstr "" -#: templates/modules/donation-box.html:47 +#: templates/modules/donation-box.html:53 msgid "Bank Transfer" msgstr "" +#: templates/modules/donation-box.html:71 +msgid "euro bank transfer" +msgstr "" + +#: templates/modules/donation-box.html:73 +msgid "IBAN" +msgstr "" + +#: templates/modules/donation-box.html:74 +msgid "BIC-/SWIFT-Code" +msgstr "" + +#: templates/modules/donation-box.html:77 +#: templates/modules/donation-box.html:91 +msgid "Reason for transfer" +msgstr "" + +#: templates/modules/donation-box.html:84 +msgid "bank transfer within Germany" +msgstr "" + +#: templates/modules/donation-box.html:86 +msgid "Bank account owner" +msgstr "" + +#: templates/modules/donation-box.html:87 +msgid "Bank account number" +msgstr "" + +#: templates/modules/donation-box.html:88 +msgid "Bank code" +msgstr "" + #: templates/modules/release-item.html:2 #: templates/modules/sidebar-release.html:4 templates/index.html:24 #: templates/index.html:47 diff --git a/www/webapp/ui_modules.py b/www/webapp/ui_modules.py index ead91e3c..6994e75f 100644 --- a/www/webapp/ui_modules.py +++ b/www/webapp/ui_modules.py @@ -307,5 +307,9 @@ class WishModule(UIModule): class DonationBoxModule(UIModule): - def render(self): - return self.render_string("modules/donation-box.html") + def render(self, reason_for_transfer=None): + if reason_for_transfer: + reason_for_transfer = "IPFire.org - %s" % reason_for_transfer + + return self.render_string("modules/donation-box.html", + reason_for_transfer=reason_for_transfer)