]> git.ipfire.org Git - ipfire.org.git/commitdiff
wishlist: Make the reason for transfer things more clear.
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 23 Oct 2012 09:30:20 +0000 (11:30 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 23 Oct 2012 09:30:20 +0000 (11:30 +0200)
www/templates/modules/donation-box.html
www/templates/static/donation.html
www/templates/wishlist/donate.html
www/translations/de_DE/LC_MESSAGES/webapp.po
www/translations/webapp.pot
www/webapp/ui_modules.py

index 9087cb057ab1e59c1379e161b77ed49a12c3ff7e..7c5ba4afa3b93b01ae5e67323ade38d3debb79dc 100644 (file)
@@ -9,7 +9,7 @@
                        <div class="accordion-inner">
                                {% if lang == "de" %}
                                        <p>
-                                               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.
                                        </p>
 
@@ -17,6 +17,9 @@
                                                <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
                                                        <input type="hidden" name="cmd" value="_s-xclick">
                                                        <input type="hidden" name="hosted_button_id" value="Z44GQ52ZHKVFW">
+                                                       {% if reason_for_transfer %}
+                                                               <input type="hidden" name="item_name" value="{{ reason_for_transfer }}">
+                                                       {% end %}
                                                        <input type="image" src="https://www.paypalobjects.com/de_DE/DE/i/btn/btn_donate_LG.gif" border="0" name="submit" alt="Jetzt einfach, schnell und sicher online bezahlen – mit PayPal.">
                                                        <img alt="" border="0" src="https://www.paypalobjects.com/de_DE/i/scr/pixel.gif" width="1" height="1">
                                                </form>
@@ -32,6 +35,9 @@
                                                <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
                                                        <input type="hidden" name="cmd" value="_s-xclick">
                                                        <input type="hidden" name="hosted_button_id" value="HHBTSN9QRWPAY">
+                                                       {% if reason_for_transfer %}
+                                                               <input type="hidden" name="item_name" value="{{ reason_for_transfer }}">
+                                                       {% end %}
                                                        <input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
                                                        <img alt="" border="0" src="https://www.paypalobjects.com/de_DE/i/scr/pixel.gif" width="1" height="1">
                                                </form>
                                        <p>
                                                Ebenso ist eine Spende auf unser Bankkonto möglich.
                                        </p>
-
-                                       <div class="row-fluid">
-                                               <div class="span6">
-                                                       <h4>Euro-Überweisung/SEPA</h4>
-
-                                                       <blockquote>
-                                                               IBAN: DE86 4265 0150 1020 0768 89<br>
-                                                               BIC-/SWIFT-Code: WELADED1REK
-                                                       </blockquote>
-                                               </div>
-
-                                               <div class="span6">
-                                                       <h4>Überweisung innerhalb Deutschlands</h4>
-                                                       <blockquote>
-                                                               Kontoinhaber: Michael Tremer<br>
-                                                               Kontonummer: 1020076889<br>
-                                                               Bankleitzahl: 426 501 50
-                                                       </blockquote>
-                                               </div>
-                                       </div>
                                {% else %}
                                        <p>
                                                It is also possible to transfer donations into
                                                our bank account.
                                        </p>
+                               {% end %}
 
-                                       <div class="row-fluid">
-                                               <div class="span6">
-                                                       <h4>euro bank transfer</h4>
-                                                       <blockquote>
-                                                               IBAN: DE86 4265 0150 1020 0768 89<br>
-                                                               BIC-/SWIFT-Code: WELADED1REK
+                               <div class="row-fluid">
+                                       <div class="span6">
+                                               <h4>{{ _("euro bank transfer") }}</h4>
+                                               <blockquote>
+                                                       {{ _("IBAN") }}: DE86 4265 0150 1020 0768 89<br>
+                                                       {{ _("BIC-/SWIFT-Code") }}: WELADED1REK
+                                                       {% if reason_for_transfer %}
+                                                               <br>
+                                                               {{ _("Reason for transfer") }}:
+                                                               <strong>{{ reason_for_transfer }}</strong>
+                                                       {% end %}
                                                        </blockquote>
-                                               </div>
+                                       </div>
 
-                                               <div class="span6">
-                                                       <h4>bank transfer within Germany</h4>
-                                                       <blockquote>
-                                                               Bank account owner: Michael Tremer<br>
-                                                               Bank account number: 1020076889<br>
-                                                               Bank code: 426 501 50
-                                                       </blockquote>
-                                               </div>
+                                       <div class="span6">
+                                               <h4>{{ _("bank transfer within Germany") }}</h4>
+                                               <blockquote>
+                                                       {{ _("Bank account owner") }}: Michael Tremer<br>
+                                                       {{ _("Bank account number") }}: 1020076889<br>
+                                                       {{ _("Bank code") }}: 426 501 50
+                                                       {% if reason_for_transfer %}
+                                                               <br>
+                                                               {{ _("Reason for transfer") }}:
+                                                               <strong>{{ reason_for_transfer }}</strong>
+                                                       {% end %}
+                                               </blockquote>
                                        </div>
-                               {% end %}
+                               </div>
                        </div>
                </div>
        </div>
index 152ecba1dc0dd84265e0ec33bb2423c2a8fb3d97..5c25fc83a8a9b4b4e0aaf903541f2cdbba90e8b6 100644 (file)
@@ -7,61 +7,58 @@
                <h1>{{ _("Donation") }}</h1>
        </div>
 
-       <div class="row">
-               <div class="span12">
-                       {% if lang == "de" %}
-                               <p>
-                                       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.
-                               </p>
-                               <p>
-                                       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.
-                               </p>
-                               <p>
-                                       Deshalb ermutigen wir jeden, der IPFire einsetzt einen Beitrag zu leisten.
-                                       Danke dafür.
-                               </p>
-                       {% else %}
-                               <p>
-                                       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 <a href="/getinvolved">feedback, every bug report, patch and contribution</a>.
-                               </p>
-                               <p>
-                                       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.
-                               </p>
-                                       So we encourage anyone who downloads and uses IPFire to donate.
-                                       It is very much appreciated.
-                               </p>
-                       {% end %}
-               </div>
-       </div>
+       {% if lang == "de" %}
+               <p>
+                       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.
+               </p>
+               <p>
+                       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.
+               </p>
+               <p>
+                       Deshalb ermutigen wir jeden, der IPFire einsetzt einen Beitrag zu leisten.
+                       Danke dafür.
+               </p>
+       {% else %}
+               <p>
+                       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 <a href="/getinvolved">feedback, every bug report, patch and contribution</a>.
+               </p>
+               <p>
+                       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.
+               </p>
+               <p>
+                       So we encourage anyone who downloads and uses IPFire to donate.
+                       It is very much appreciated.
+               </p>
+       {% end %}
 
        <hr>
 
        <div class="row">
-               <div class="span8 offset2">
+               <div class="span10 offset1">
                        {{ modules.DonationBox() }}
 
-                       <div class="alert alert-success">
-                               <h5>{{ _("Did you know...?") }}</h5>
+                       <div class="muted ac">
+                               <strong>{{ _("Did you know...?") }}</strong>
 
                                {% if lang == "de" %}
                                        Du kannst die Implementierung deiner bevorzugten Funktion mit Hilfe einer Spende auf der
index 0588f1796357f563d17888e06b7094d4cafdf95d..f32905988d3bfeee4820a8e4d0176e7fddf80d04 100644 (file)
@@ -7,53 +7,32 @@
                <h2>{{ wish.title }}</h2>
        </div>
 
-       <div class="row">
-               <div class="span9">
-                       {% if lang == "de" %}
-                               <p>
-                                       Bevor du mit deiner Spende fortfährst, lies bitte die
-                                       <a href="/terms">{{ _("Terms & Conditions") }}</a>.
-                                       Solltest du mit diesen nicht einverstanden sein,
-                                       fahre nicht weiter fort.
-                               </p>
-                       {% else %}
-                               <p>
-                                       Before you make your donation, make sure that you
-                                       have read the <a href="/terms">{{ _("Terms & Conditions") }}</a>.
-                                       In case you don't agree to them, please stop right here.
-                               </p>
-                       {% end %}
-
-                       {% if lang == "de" %}
-                               <p>
-                                       Um fortzufahren, wähle eine der Bezahlmethoden aus und
-                                       <strong>
-                                               stelle sicher, dass du den nebenstehenden Verwendungszweck mit angibst.
-                                       </strong>
-                               </p>
-                       {% else %}
-                               <p>
-                                       To go on, please pick one of the methods below to make your donation.
-                                       <strong>
-                                               Make sure that you state the reason you are donating in the comment box with your donation.
-                                       </strong>
-                               </p>
-                       {% end %}
-               </div>
-
-               <div class="span3">
-                       <div class="well well-small ac">
-                               <h4>{{ _("Reason for transfer") }}</h4>
-                               {{ wish.tag }}
-                       </div>
-               </div>
-       </div>
+       {% if lang == "de" %}
+               <p>
+                       Bevor du mit deiner Spende fortfährst, lies bitte die
+                       <a href="/terms">{{ _("Terms & Conditions") }}</a>.
+                       Solltest du mit diesen nicht einverstanden sein,
+                       fahre nicht weiter fort.
+               </p>
+               <p>
+                       Wähle dann deine präferierte Bezahlmethode aus, um deine Spende zu tätigen.
+               </p>
+       {% else %}
+               <p>
+                       Before you make your donation, make sure that you
+                       have read the <a href="/terms">{{ _("Terms & Conditions") }}</a>.
+                       In case you don't agree to them, please stop right here.
+               </p>
+               <p>
+                       To go on, please pick one of the methods below to make your donation.
+               </p>
+       {% end %}
 
        <hr>
 
        <div class="row">
-               <div class="span8 offset2">
-                       {{ modules.DonationBox() }}
+               <div class="span10 offset1">
+                       {{ modules.DonationBox(wish.tag) }}
                </div>
        </div>
 {% end block %}
index c8d6c47845cf80dd008a055def4f8b1812ca6461..c120aa05f8570043aae798739fec8b56b7a114e2 100644 (file)
@@ -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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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
index 76dfe4b0dbdb533628c38a06b6a48ae61538800e..5807bc04852d9e20919655d42b9ba32a28303ad6 100644 (file)
@@ -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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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
index ead91e3ce1596522f2330c43b19c7e8ce1ae2ced..6994e75fad64e65301173a2f31f8bf9f282cd2c8 100644 (file)
@@ -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)