C3L/C3L-Membership-Online-Form Changeset - 68ea3e6dd3a6 · Chaos Computer Club Lëtzebuerg Projects

Changeset - 68ea3e6dd3a6

Parent rev.

Child rev.

[Not reviewed]

default

0 12 0

Dennis Fink - 3 years ago 2022-05-11 11:23:10
dennis.fink@c3l.lu

Make the birthday mandatory

12 files changed with 230 insertions and 197 deletions:

c3l_membership/forms.py

c3l_membership/static/style.css

c3l_membership/templates/index.html

c3l_membership/templates/member.html

c3l_membership/translations/de/LC_MESSAGES/messages.mo

bin+mod

c3l_membership/translations/de/LC_MESSAGES/messages.po

c3l_membership/translations/fr/LC_MESSAGES/messages.mo

bin+mod

c3l_membership/translations/fr/LC_MESSAGES/messages.po

c3l_membership/translations/lb/LC_MESSAGES/messages.mo

bin+mod

c3l_membership/translations/lb/LC_MESSAGES/messages.po

c3l_membership/views.py

messages.pot

0 comments (0 inline, 0 general)

c3l_membership/forms.py

➞

Show inline comments

@@ @@ -117,7 +117,7 @@ class MembershipForm(FlaskForm): @@
         validators=[InputRequired(lazy_gettext("Please select one of the options!"))],
+    )
-    birthday = DateField(lazy_gettext("Birthday"), validators=[Optional()])
+    birthday = DateField(lazy_gettext("Birthday"), validators=[InputRequired()])
     street = StringField(
         lazy_gettext("Nr., Street"),
@@ @@ -151,9 +151,4 @@ class MembershipForm(FlaskForm): @@
         validators=[InputRequired()],
+    )
     minor_member = BooleanField(
         lazy_gettext(
             "I am under 18 years of age and have the approval of my legal representative."
+        )
+    )
     submit = SubmitField(lazy_gettext("Become a member"))

c3l_membership/static/style.css

➞

Show inline comments

@@ @@ -42,3 +42,12 @@ p { @@
 .text-justify {
   text-align: justify;
+}
 legend {
   font-weight: bold;
   font-size: 1.25em;
+}
 h4 {
   margin-bottom: 0.5em;
+}

c3l_membership/templates/index.html

➞

Show inline comments

@@ @@ -74,7 +74,7 @@ @@
             </div>
             <div class="pure-g">
               <div class="pure-u-1-1">
-                <b>{{ form.membership.label }}</b>
+                <h3>{{ form.membership.label }}</h3>
                 {% for option in form.membership %}
                   <label for="{{ option.id }}" class="pure-radio pure-u-1-1">
                     {{ option() }} {{ option.label.text }}
@@ @@ -91,13 +91,8 @@ @@
                       {{ form.starving }} {{ form.starving.label.text|safe}}
                     </label>
                   </div>
                   <div class="pure-u-1-1">
                     <label for="{{ form.minor_member.id }}" class="pure-checkbox">
                       {{ form.minor_member }} {{ form.minor_member.label.text|safe}}
                     </label>
                   </div>
                 </div>
-                <h3>{% trans %}What's difference between the different membership options?{% endtrans %}</h3>
+                <h4>{% trans %}What's difference between the different membership options?{% endtrans %}</h4>
                 <p>{% trans %}All the options include to following benefits:{% endtrans %}</p>
                 <ul>
                   <li>{% trans %}Access to the <a href="https://wiki.c3l.lu/doku.php?id=organization:membership#benefits">services</a> run by us{% endtrans %}</li>
@@ @@ -109,15 +104,15 @@ @@
                     <li>{% trans %}Access to our internal mailinglist{% endtrans %}</li>
                   </ul>
                   <p>{% trans %}You can read more on the membership <a href="https://wiki.c3l.lu/doku.php?id=organization:membership">here</a>.{% endtrans %}</p>
-                  <h3>{% trans %}What are the membership fees?{% endtrans %}</h3>
+                  <h4>{% trans %}What are the membership fees?{% endtrans %}</h4>
                   <p>{% trans regular_fee=config["REGULAR_FEE"], supporting_fee=config["SUPPORTING_FEE"] %}The membership fee for the regular membership is {{ regular_fee }}€ per year. The membership fee for the supporting membership is {{ supporting_fee }}€ per year. If you are a student, all membership fees are {{ supporting_fee }}€ per year. For that please select the corresponding option.{% endtrans %}</p>
-                  <h3>{% trans %}I cannot afford the membership?{% endtrans %}</h3>
+                  <h4>{% trans %}I cannot afford the membership?{% endtrans %}</h4>
                   <p>{% trans %}If you cannot afford the membership, please contact us via info@c3l.lu first, before filling out the membership form. We will try to find a solution together.{% endtrans %}</p>
                 </div>
                 </div>
                 <div class="pure-g">
                   <div class="pure-u-1-1">
-                    <b>{{ form.payment.label }}</b>
+                    <h3>{{ form.payment.label }}</h3>
                     {% for option in form.payment %}
                       <label for="{{ option.id }}" class="pure-radio pure-u-1-1">
                         {{ option() }} {{ option.label.text }}
@@ @@ -125,13 +120,21 @@ @@
                     {% endfor %}
                   </div>
                 </div>
                 <legend>{% trans %}Additional information{% endtrans %}</legend>
                 <div class="pure-g">
                   <div class="pure-u-1-1">
                     <b>{{ form.birthday.label }}</b>
                     {{ form.birthday(class="pure-input-1 field-error" if form.birthday.errors else "pure-input-1") }}
                   </div>
                   <div class="pure-u-1-1">
                     <h4>{% trans %}Why do you ask for the birthday?{% endtrans %}</h4>
                     <p>{% trans %}This information helps us with a few different things:{% endtrans %}</p>
                     <ul>
                       <li>{% trans %}We need to know if you are underage. If so your legal representatives needs to sign this membership application.{% endtrans %}</li>
                       <li>{% trans %}We ask the city of Luxembourg every year for a financial grant and they ask how many members we have over the age of 26 and how many under the age of 26.{% endtrans %}</li>
                     </ul>
                   </div>
                 </div>
                 <legend>{% trans %}Additional information (Optional){% endtrans %}</legend>
                 <div class="pure-g">
                   <div class="pure-u-1-1">
                     <b>{{ form.street.label }}</b>

c3l_membership/templates/member.html

➞

Show inline comments

@@ @@ -77,7 +77,7 @@ @@
       </div>
       <div>
         <div>{% trans %}Minor Member:{% endtrans %}</div>
-        <div>{{ _("Yes") if form.minor_member.data else _("No") }}</div>
         <div>{{ _("Yes") if minor_member else _("No") }}</div>
       </div>
     </div>
     <p>{% trans %}Send this document to the Chaos Computer Club Lëtzebuerg!{% endtrans %}</p>
@@ @@ -121,7 +121,7 @@ @@
     <div class="signature">
       <p class="membersignature">{% trans %}Luxembourg, the{% endtrans %}</p>
       <p class="adminsignature">
-        {{ _("Signature of your legal representative") if form.minor_member.data else _("Your signature") }}
         {{ _("Signature of your legal representative") if minor_member else _("Your signature") }}
       </p>
     </div>
     <footer>

c3l_membership/translations/de/LC_MESSAGES/messages.mo

➞

Show inline comments

binary diff not shown

c3l_membership/translations/de/LC_MESSAGES/messages.po

➞

Show inline comments

@@ @@ -7,8 +7,8 @@ msgid "" @@
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2022-02-25 22:48+0100\n"
 "PO-Revision-Date: 2022-02-25 22:48+0100\n"
 "POT-Creation-Date: 2022-05-11 10:02+0200\n"
 "PO-Revision-Date: 2022-05-11 10:13+0200\n"
 "Last-Translator: Dennis Fink <dennis.fink@c3l.lu>\n"
 "Language-Team: de <LL@li.org>\n"
 "Language: de\n"
@@ @@ -130,32 +130,27 @@ msgstr "" @@
 "statutes.c3l.lu\">Satzung des Chaos Computer Club Lëtzebuerg A.S.B.L.</a> "
 "gelesen und verstanden zu haben."
 #: c3l_membership/forms.py:155
 msgid ""
 "I am under 18 years of age and have the approval of my legal representative."
 msgstr "Ich bin unter 18 Jahre alt und habe die Zustimmung meines Vormunds."
 #: c3l_membership/forms.py:159
 #: c3l_membership/forms.py:154
 msgid "Become a member"
 msgstr "Mitglied werden"
-#: c3l_membership/views.py:34
+#: c3l_membership/views.py:35
 msgid "by cash"
 msgstr "mit Bargeld"
-#: c3l_membership/views.py:35
+#: c3l_membership/views.py:36
 msgid "by wire transfer"
 msgstr "per Überweisung"
-#: c3l_membership/views.py:39
+#: c3l_membership/views.py:40
 msgid "by DigiCash/Payconiq"
 msgstr "per DigiCash/Payconiq"
-#: c3l_membership/views.py:42
+#: c3l_membership/views.py:43
 msgid "by Satispay"
 msgstr "per Satispay"
-#: c3l_membership/views.py:45
+#: c3l_membership/views.py:46
 msgid "by"
 msgstr "per"
@@ @@ -197,16 +192,16 @@ msgstr "" @@
 msgid "Required information"
 msgstr "Erforderliche Informationen"
-#: c3l_membership/templates/index.html:97
+#: c3l_membership/templates/index.html:95
 msgid "What's difference between the different membership options?"
 msgstr ""
 "Was ist der Unterschied zwischen den verschiedenen Mitgliedschaftsoptionen?"
-#: c3l_membership/templates/index.html:98
+#: c3l_membership/templates/index.html:96
 msgid "All the options include to following benefits:"
 msgstr "Alle Optionen bieten die folgenden Vorteile:"
-#: c3l_membership/templates/index.html:100
+#: c3l_membership/templates/index.html:98
 msgid ""
 "Access to the <a href=\"https://wiki.c3l.lu/doku.php?id=organization:"
 "membership#benefits\">services</a> run by us"
@@ @@ -214,27 +209,27 @@ msgstr "" @@
 "Zugang zu den von uns betriebenen <a href=\"https://wiki.c3l.lu/doku.php?"
 "id=organization:membership#benefits\">Dienstleistungen</a>"
-#: c3l_membership/templates/index.html:101
+#: c3l_membership/templates/index.html:99
 msgid ""
 "Access to our <a href=\"https://wiki.c3l.lu/doku.php?id=chaosstuff:bootstrap"
 "\">hackerspace: ChaosStuff</a>"
 "Access to our <a href=\"https://wiki.c3l.lu/doku.php?id=chaosstuff:"
 "bootstrap\">hackerspace: ChaosStuff</a>"
 msgstr ""
 "Zugang zu unserem <a href=\"https://wiki.c3l.lu/doku.php?id=chaosstuff:"
 "bootstrap\">Hackerspace: ChaosStuff</a>"
-#: c3l_membership/templates/index.html:103
+#: c3l_membership/templates/index.html:101
 msgid "Becoming a regular member gives you these additional benefits:"
 msgstr "Als ordentliches Mitglied erhalten Sie diese zusätzlichen Vorteile:"
-#: c3l_membership/templates/index.html:105
+#: c3l_membership/templates/index.html:103
 msgid "Voting rights on general assemblys"
 msgstr "Stimmrecht in Generalversammlungen"
-#: c3l_membership/templates/index.html:106
+#: c3l_membership/templates/index.html:104
 msgid "Access to our internal mailinglist"
 msgstr "Zugang zu unserer internen Mailingliste"
-#: c3l_membership/templates/index.html:108
+#: c3l_membership/templates/index.html:106
 msgid ""
 "You can read more on the membership <a href=\"https://wiki.c3l.lu/doku.php?"
 "id=organization:membership\">here</a>."
@@ @@ -242,11 +237,11 @@ msgstr "" @@
 "Mehr über die Mitgliedschaft können Sie <a href=\"https://wiki.c3l.lu/doku."
 "php?id=organization:membership\">hier</a> lesen."
-#: c3l_membership/templates/index.html:109
+#: c3l_membership/templates/index.html:107
 msgid "What are the membership fees?"
 msgstr "Wie hoch sind die Mitgliedsbeiträge?"
-#: c3l_membership/templates/index.html:110
+#: c3l_membership/templates/index.html:108
 #, python-format
 msgid ""
 "The membership fee for the regular membership is %(regular_fee)s€ per year. "
@@ @@ -260,11 +255,11 @@ msgstr "" @@
 "Mitgliedsbeiträge %(supporting_fee)s€ pro Jahr. Bitte wählen Sie dazu die "
 "entsprechende Option."
-#: c3l_membership/templates/index.html:111
+#: c3l_membership/templates/index.html:109
 msgid "I cannot afford the membership?"
 msgstr "Ich kann mir die Mitgliedschaft nicht leisten?"
-#: c3l_membership/templates/index.html:112
+#: c3l_membership/templates/index.html:110
 msgid ""
 "If you cannot afford the membership, please contact us via info@c3l.lu first, "
 "before filling out the membership form. We will try to find a solution "
@@ @@ -274,9 +269,34 @@ msgstr "" @@
 "bitte zuerst über info@c3l.lu, bevor Sie das Beitrittsformular ausfüllen. Wir "
 "werden versuchen, gemeinsam eine Lösung zu finden."
 #: c3l_membership/templates/index.html:125
 msgid "Additional information"
 msgstr "Zusätzliche Informationen"
 #: c3l_membership/templates/index.html:129
 msgid "Why do you ask for the birthday?"
 msgstr "Warum fragt ihr nach dem Geburtstag?"
 #: c3l_membership/templates/index.html:130
 msgid "This information helps us with a few different things:"
 msgstr "Diese Information hilft uns bei ein paar Vorgängen:"
 #: c3l_membership/templates/index.html:132
 msgid ""
 "We need to know if you are underage. If so your legal representatives needs "
 "to sign this membership application."
 msgstr ""
 "Wir müssen wissen op sie minderjährig sind. Falls dies der Fall ist, dann "
 "muss ein Vormund für sie unterschreiben."
 #: c3l_membership/templates/index.html:133
 msgid ""
 "We ask the city of Luxembourg every year for a financial grant and they ask "
 "how many members we have over the age of 26 and how many under the age of 26."
 msgstr ""
 "Wir fragen bei der Stadt Luxemburg jedes Jahr nach finanziellen Zuschüssen "
 "und sie fragen uns wieviel Mitglieder wir haben, die jünger sind als 26 und "
 "wieviele älter sind als 26."
 #: c3l_membership/templates/index.html:137
 msgid "Additional information (Optional)"
 msgstr "Zusätzliche Informationen (Optional)"
 #: c3l_membership/templates/member.html:4
 #, python-format
@@ @@ -425,18 +445,3 @@ msgstr "Unterschrift des Vormundes" @@
 #: c3l_membership/templates/member.html:124
 msgid "Your signature"
 msgstr "Ihre Unterschrift"
 #~ msgid "by bitcoin"
 #~ msgstr "per Bitcoin"
 #~ msgid "by ethereum"
 #~ msgstr "per Ethereum"
 #~ msgid "by monero"
 #~ msgstr "per Monero"
 #~ msgid "by zcash"
 #~ msgstr "per Zcash"
 #~ msgid "by DigiCash"
 #~ msgstr "per DigiCash"

c3l_membership/translations/fr/LC_MESSAGES/messages.mo

➞

Show inline comments

binary diff not shown

c3l_membership/translations/fr/LC_MESSAGES/messages.po

➞

Show inline comments

@@ @@ -7,8 +7,8 @@ msgid "" @@
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2022-02-25 22:48+0100\n"
 "PO-Revision-Date: 2022-02-25 22:49+0100\n"
 "POT-Creation-Date: 2022-05-11 10:02+0200\n"
 "PO-Revision-Date: 2022-05-11 11:19+0200\n"
 "Last-Translator: Dennis Fink <dennis.fink@c3l.lu>\n"
 "Language-Team: fr <LL@li.org>\n"
 "Language: fr\n"
@@ @@ -124,32 +124,27 @@ msgstr "" @@
 "les <a href=\"http://statutes.c3l.lu\">statuts du Chaos Computer Club "
 "Lëtzebuerg A.S.B.L.</a>."
 #: c3l_membership/forms.py:155
 msgid ""
 "I am under 18 years of age and have the approval of my legal representative."
 msgstr "J'ai moins de 18 ans et j'ai l'accord de mon représentant légal."
 #: c3l_membership/forms.py:159
 #: c3l_membership/forms.py:154
 msgid "Become a member"
 msgstr "Devenir membre"
-#: c3l_membership/views.py:34
+#: c3l_membership/views.py:35
 msgid "by cash"
 msgstr "en espèces"
-#: c3l_membership/views.py:35
+#: c3l_membership/views.py:36
 msgid "by wire transfer"
 msgstr "par virement bancaire"
-#: c3l_membership/views.py:39
+#: c3l_membership/views.py:40
 msgid "by DigiCash/Payconiq"
 msgstr "par DigiCash/Payconiq"
-#: c3l_membership/views.py:42
+#: c3l_membership/views.py:43
 msgid "by Satispay"
 msgstr "par Satispay"
-#: c3l_membership/views.py:45
+#: c3l_membership/views.py:46
 msgid "by"
 msgstr "par"
@@ @@ -190,15 +185,15 @@ msgstr "" @@
 msgid "Required information"
 msgstr "Informations requises"
-#: c3l_membership/templates/index.html:97
+#: c3l_membership/templates/index.html:95
 msgid "What's difference between the different membership options?"
 msgstr "Quelle est la différence entre les différentes options d'adhésion?"
-#: c3l_membership/templates/index.html:98
+#: c3l_membership/templates/index.html:96
 msgid "All the options include to following benefits:"
 msgstr "Toutes les options comprennent les avantages suivants:"
-#: c3l_membership/templates/index.html:100
+#: c3l_membership/templates/index.html:98
 msgid ""
 "Access to the <a href=\"https://wiki.c3l.lu/doku.php?id=organization:"
 "membership#benefits\">services</a> run by us"
@@ @@ -206,29 +201,29 @@ msgstr "" @@
 "Accès aux <a href=\"https://wiki.c3l.lu/doku.php?id=organization:"
 "membership#benefits\">services</a> gérés par nos soins"
-#: c3l_membership/templates/index.html:101
+#: c3l_membership/templates/index.html:99
 msgid ""
 "Access to our <a href=\"https://wiki.c3l.lu/doku.php?id=chaosstuff:bootstrap"
 "\">hackerspace: ChaosStuff</a>"
 "Access to our <a href=\"https://wiki.c3l.lu/doku.php?id=chaosstuff:"
 "bootstrap\">hackerspace: ChaosStuff</a>"
 msgstr ""
 "Access to our <a href=\"https://wiki.c3l.lu/doku.php?id=chaosstuff:bootstrap"
 "\">hackerspace: ChaosStuff</a>"
 "Access to our <a href=\"https://wiki.c3l.lu/doku.php?id=chaosstuff:"
 "bootstrap\">hackerspace: ChaosStuff</a>"
-#: c3l_membership/templates/index.html:103
+#: c3l_membership/templates/index.html:101
 msgid "Becoming a regular member gives you these additional benefits:"
 msgstr ""
 "En devenant un membre régulier, vous bénéficiez de ces avantages "
 "supplémentaires:"
-#: c3l_membership/templates/index.html:105
+#: c3l_membership/templates/index.html:103
 msgid "Voting rights on general assemblys"
 msgstr "Droit de vote aux assemblées générales"
-#: c3l_membership/templates/index.html:106
+#: c3l_membership/templates/index.html:104
 msgid "Access to our internal mailinglist"
 msgstr "Accès à notre liste de diffusion interne"
-#: c3l_membership/templates/index.html:108
+#: c3l_membership/templates/index.html:106
 msgid ""
 "You can read more on the membership <a href=\"https://wiki.c3l.lu/doku.php?"
 "id=organization:membership\">here</a>."
@@ @@ -236,11 +231,11 @@ msgstr "" @@
 "Vous pouvez en savoir plus sur l'adhésion <a href=\"https://wiki.c3l.lu/doku."
 "php?id=organization:membership\">ici</a>."
-#: c3l_membership/templates/index.html:109
+#: c3l_membership/templates/index.html:107
 msgid "What are the membership fees?"
 msgstr "Quelles sont les cotisations des membres?"
-#: c3l_membership/templates/index.html:110
+#: c3l_membership/templates/index.html:108
 #, python-format
 msgid ""
 "The membership fee for the regular membership is %(regular_fee)s€ per year. "
@@ @@ -253,11 +248,11 @@ msgstr "" @@
 "vous êtes étudiant, toutes les cotisations sont de %(supporting_fee)s€ par an. "
 "Pour cela, veuillez sélectionner l'option correspondante."
-#: c3l_membership/templates/index.html:111
+#: c3l_membership/templates/index.html:109
 msgid "I cannot afford the membership?"
 msgstr "Je n'ai pas les moyens de payer l'adhésion?"
-#: c3l_membership/templates/index.html:112
+#: c3l_membership/templates/index.html:110
 msgid ""
 "If you cannot afford the membership, please contact us via info@c3l.lu first, "
 "before filling out the membership form. We will try to find a solution "
@@ @@ -267,9 +262,34 @@ msgstr "" @@
 "contacter via info@c3l.lu, avant de remplir le formulaire d'adhésion. Nous "
 "essaierons de trouver une solution ensemble."
 #: c3l_membership/templates/index.html:125
 msgid "Additional information"
 msgstr "Informations complémentaires"
 #: c3l_membership/templates/index.html:129
 msgid "Why do you ask for the birthday?"
 msgstr "Pourquoi demandez-vous l'anniversaire?"
 #: c3l_membership/templates/index.html:130
 msgid "This information helps us with a few different things:"
 msgstr "Ces informations nous aident dans plusieurs domaines:"
 #: c3l_membership/templates/index.html:132
 msgid ""
 "We need to know if you are underage. If so your legal representatives needs to "
 "sign this membership application."
 msgstr ""
 "Nous devons savoir si vous êtes mineur. Si c'est le cas, vos représentants "
 "légaux doivent signer cette demande d'adhésion."
 #: c3l_membership/templates/index.html:133
 msgid ""
 "We ask the city of Luxembourg every year for a financial grant and they ask "
 "how many members we have over the age of 26 and how many under the age of 26."
 msgstr ""
 "Nous demandons chaque année à la ville de Luxembourg une subvention financière "
 "et ils demandent combien de membres nous avons de plus de 26 ans et combien de "
 "moins de 26 ans."
 #: c3l_membership/templates/index.html:137
 msgid "Additional information (Optional)"
 msgstr "Informations complémentaires (facultatif)"
 #: c3l_membership/templates/member.html:4
 #, python-format
@@ @@ -420,18 +440,3 @@ msgstr "Signature de votre représentant légal" @@
 #: c3l_membership/templates/member.html:124
 msgid "Your signature"
 msgstr "Votre signature"
 #~ msgid "by bitcoin"
 #~ msgstr "par Bitcoin"
 #~ msgid "by ethereum"
 #~ msgstr "par Ethereum"
 #~ msgid "by monero"
 #~ msgstr "par Monero"
 #~ msgid "by zcash"
 #~ msgstr "par Zcash"
 #~ msgid "by DigiCash"
 #~ msgstr "par DigiCash"

c3l_membership/translations/lb/LC_MESSAGES/messages.mo

➞

Show inline comments

binary diff not shown

c3l_membership/translations/lb/LC_MESSAGES/messages.po

➞

Show inline comments

@@ @@ -7,8 +7,8 @@ msgid "" @@
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2022-02-25 22:48+0100\n"
 "PO-Revision-Date: 2022-02-25 22:49+0100\n"
 "POT-Creation-Date: 2022-05-11 10:02+0200\n"
 "PO-Revision-Date: 2022-05-11 10:09+0200\n"
 "Last-Translator: Dennis Fink <dennis.fink@c3l.lu>\n"
 "Language-Team: lb <LL@li.org>\n"
 "Language: lb\n"
@@ @@ -127,32 +127,27 @@ msgstr "" @@
 "href=\"https://statutes.c3l.lu\">d'Statute vum Chaos Computer Club Lëtzebuerg "
 "A.S.B.L.</a> gelies a verstanen ze hunn."
 #: c3l_membership/forms.py:155
 msgid ""
 "I am under 18 years of age and have the approval of my legal representative."
 msgstr "Ech sinn méi Jonk wéi 18 Joer an hunn d'Zoustëmmung vu mengem Tuteur."
 #: c3l_membership/forms.py:159
 #: c3l_membership/forms.py:154
 msgid "Become a member"
 msgstr "Member ginn"
-#: c3l_membership/views.py:34
+#: c3l_membership/views.py:35
 msgid "by cash"
 msgstr "mat Boergeld"
-#: c3l_membership/views.py:35
+#: c3l_membership/views.py:36
 msgid "by wire transfer"
 msgstr "per Iwwerweisung"
-#: c3l_membership/views.py:39
+#: c3l_membership/views.py:40
 msgid "by DigiCash/Payconiq"
 msgstr "mat DigiCash/Payconiq"
-#: c3l_membership/views.py:42
+#: c3l_membership/views.py:43
 msgid "by Satispay"
 msgstr "mat Satispay"
-#: c3l_membership/views.py:45
+#: c3l_membership/views.py:46
 msgid "by"
 msgstr "mat"
@@ @@ -192,15 +187,15 @@ msgstr "" @@
 msgid "Required information"
 msgstr "Erfuerderlech Informatiounen"
-#: c3l_membership/templates/index.html:97
+#: c3l_membership/templates/index.html:95
 msgid "What's difference between the different membership options?"
 msgstr "Wat sinn Ënnerscheeder tëscht deene verschiddene Memberschaftsoptiounen?"
-#: c3l_membership/templates/index.html:98
+#: c3l_membership/templates/index.html:96
 msgid "All the options include to following benefits:"
 msgstr "All Optiounen enthalen déi folgend Virdeeler:"
-#: c3l_membership/templates/index.html:100
+#: c3l_membership/templates/index.html:98
 msgid ""
 "Access to the <a href=\"https://wiki.c3l.lu/doku.php?id=organization:"
 "membership#benefits\">services</a> run by us"
@@ @@ -208,27 +203,27 @@ msgstr "" @@
 "Accès op <a href=\"https://wiki.c3l.lu/doku.php?id=organization:"
 "membership#benefits\">Servicer</a>, déi mir bedreiwen"
-#: c3l_membership/templates/index.html:101
+#: c3l_membership/templates/index.html:99
 msgid ""
 "Access to our <a href=\"https://wiki.c3l.lu/doku.php?id=chaosstuff:bootstrap"
 "\">hackerspace: ChaosStuff</a>"
 "Access to our <a href=\"https://wiki.c3l.lu/doku.php?id=chaosstuff:"
 "bootstrap\">hackerspace: ChaosStuff</a>"
 msgstr ""
 "Accès an eisen <a href=\"https://wiki.c3l.lu/doku.php?id=chaosstuff:bootstrap"
 "\">Hackerspace: ChaosStuff</a>"
 "Accès an eisen <a href=\"https://wiki.c3l.lu/doku.php?id=chaosstuff:"
 "bootstrap\">Hackerspace: ChaosStuff</a>"
-#: c3l_membership/templates/index.html:103
+#: c3l_membership/templates/index.html:101
 msgid "Becoming a regular member gives you these additional benefits:"
 msgstr "Regulär Memberschaft gëtt Iech dës zousätzlech Virdeeler:"
-#: c3l_membership/templates/index.html:105
+#: c3l_membership/templates/index.html:103
 msgid "Voting rights on general assemblys"
 msgstr "Stëmmrecht op der Assemblée Générale"
-#: c3l_membership/templates/index.html:106
+#: c3l_membership/templates/index.html:104
 msgid "Access to our internal mailinglist"
 msgstr "Accès op eis intern Mailinglëscht"
-#: c3l_membership/templates/index.html:108
+#: c3l_membership/templates/index.html:106
 msgid ""
 "You can read more on the membership <a href=\"https://wiki.c3l.lu/doku.php?"
 "id=organization:membership\">here</a>."
@@ @@ -236,11 +231,11 @@ msgstr "" @@
 "Dir kënnt méi iwwert d'Memberschaft <a href=\"https://wiki.c3l.lu/doku.php?"
 "id=organization:membership\">hei</a> noliesen."
-#: c3l_membership/templates/index.html:109
+#: c3l_membership/templates/index.html:107
 msgid "What are the membership fees?"
 msgstr "Wat sinn Cotisatiounen?"
-#: c3l_membership/templates/index.html:110
+#: c3l_membership/templates/index.html:108
 #, python-format
 msgid ""
 "The membership fee for the regular membership is %(regular_fee)s€ per year. "
@@ @@ -253,11 +248,11 @@ msgstr "" @@
 "Joer. Wann dir ee Student sidd, sinn all Cotisatiounen %(supporting_fee)s€ pro "
 "Joer. Fir dëst wielt déi respektiv Optioun aus."
-#: c3l_membership/templates/index.html:111
+#: c3l_membership/templates/index.html:109
 msgid "I cannot afford the membership?"
 msgstr "Ech ka mir d'Memberschaft net leeschten?"
-#: c3l_membership/templates/index.html:112
+#: c3l_membership/templates/index.html:110
 msgid ""
 "If you cannot afford the membership, please contact us via info@c3l.lu first, "
 "before filling out the membership form. We will try to find a solution "
@@ @@ -267,9 +262,33 @@ msgstr "" @@
 "iwwer info@c3l.lu ier Dir de Membersformular ausfëllt. Mir probéieren zesummen "
 "eng Léisung ze fannen."
 #: c3l_membership/templates/index.html:125
 msgid "Additional information"
 msgstr "Zousätzlech Informatiounen"
 #: c3l_membership/templates/index.html:129
 msgid "Why do you ask for the birthday?"
 msgstr "Firwat frot dir nom Gebuertsdag?"
 #: c3l_membership/templates/index.html:130
 msgid "This information helps us with a few different things:"
 msgstr "Dës Informatioun hëlleft eis mat verschiddene Saachen:"
 #: c3l_membership/templates/index.html:132
 msgid ""
 "We need to know if you are underage. If so your legal representatives needs to "
 "sign this membership application."
 msgstr ""
 "Mir musse wëssen op dier mannerjäreg sidd. Falls dat de Fall ass, da muss "
 "ären Tuteur ënnerschreiwen."
 #: c3l_membership/templates/index.html:133
 msgid ""
 "We ask the city of Luxembourg every year for a financial grant and they ask "
 "how many members we have over the age of 26 and how many under the age of 26."
 msgstr ""
 "Mier froe bei der Stad Lëtzebuerg all Joers no Subsiden an déi froen eis, wéi "
 "vill Membere mir hunn, déi iwwer 26 sinn a wéi vill Memberen ënner 26."
 #: c3l_membership/templates/index.html:137
 msgid "Additional information (Optional)"
 msgstr "Zousätzlech Informatiounen (Optional)"
 #: c3l_membership/templates/member.html:4
 #, python-format
@@ @@ -418,18 +437,3 @@ msgstr "Ënnerschrëft vun ärem Tuteur" @@
 #: c3l_membership/templates/member.html:124
 msgid "Your signature"
 msgstr "Äer Ënnerschrëft"
 #~ msgid "by bitcoin"
 #~ msgstr "mat Bitcoin"
 #~ msgid "by ethereum"
 #~ msgstr "mat Ethereum"
 #~ msgid "by monero"
 #~ msgstr "mat Monero"
 #~ msgid "by zcash"
 #~ msgstr "mat Zcash"
 #~ msgid "by DigiCash"
 #~ msgstr "per DigiCash"

c3l_membership/views.py

➞

Show inline comments

@@ @@ -56,16 +56,12 @@ def index(): @@
         if form.birthday.data:
             if calculate_age(form.birthday.data) < 18:
-                form.minor_member.data = True
                 minor_member = True
                 form.student.data = True
             else:
-                form.minor_member.data = False
                 minor_member = False
         if (
             form.minor_member.data
             or form.student.data
             or form.membership.data == "supporting"
         ):
         if minor_member or form.student.data or form.membership.data == "supporting":
             price = current_app.config["SUPPORTING_FEE"]
         elif form.starving.data:
             price = 1
@@ @@ -74,7 +70,7 @@ def index(): @@
         if form.starving.data:
             status = "Starving"
-        elif form.minor_member.data or form.student.data:
         elif minor_member or form.student.data:
             status = "Student"
         elif form.membership.data == "supporting":
             status = "Supporter"
@@ @@ -131,6 +127,7 @@ def index(): @@
             year=today.year,
             voting=True if form.membership.data == "regular" else False,
             xml=xml_template.format(**xml_data),
             minor_member=minor_member,
+        )
         return render_pdf(
             HTML(string=html),

messages.pot

➞

Show inline comments

@@ @@ -8,7 +8,7 @@ msgid "" @@
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-02-25 22:48+0100\n"
+"POT-Creation-Date: 2022-05-11 10:02+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"
@@ @@ -115,33 +115,27 @@ msgid "" @@
 "Computer Club Lëtzebuerg A.S.B.L.</a>."
 msgstr ""
 #: c3l_membership/forms.py:155
 msgid ""
 "I am under 18 years of age and have the approval of my legal "
 "representative."
 msgstr ""
 #: c3l_membership/forms.py:159
 #: c3l_membership/forms.py:154
 msgid "Become a member"
 msgstr ""
-#: c3l_membership/views.py:34
+#: c3l_membership/views.py:35
 msgid "by cash"
 msgstr ""
-#: c3l_membership/views.py:35
+#: c3l_membership/views.py:36
 msgid "by wire transfer"
 msgstr ""
-#: c3l_membership/views.py:39
+#: c3l_membership/views.py:40
 msgid "by DigiCash/Payconiq"
 msgstr ""
-#: c3l_membership/views.py:42
+#: c3l_membership/views.py:43
 msgid "by Satispay"
 msgstr ""
-#: c3l_membership/views.py:45
+#: c3l_membership/views.py:46
 msgid "by"
 msgstr ""
@@ @@ -176,51 +170,51 @@ msgstr "" @@
 msgid "Required information"
 msgstr ""
-#: c3l_membership/templates/index.html:97
+#: c3l_membership/templates/index.html:95
 msgid "What's difference between the different membership options?"
 msgstr ""
 #: c3l_membership/templates/index.html:96
 msgid "All the options include to following benefits:"
 msgstr ""
 #: c3l_membership/templates/index.html:98
 msgid "All the options include to following benefits:"
 msgstr ""
 #: c3l_membership/templates/index.html:100
 msgid ""
 "Access to the <a "
 "href=\"https://wiki.c3l.lu/doku.php?id=organization:membership#benefits\">services</a>"
 " run by us"
 msgstr ""
-#: c3l_membership/templates/index.html:101
+#: c3l_membership/templates/index.html:99
 msgid ""
 "Access to our <a "
 "href=\"https://wiki.c3l.lu/doku.php?id=chaosstuff:bootstrap\">hackerspace:"
 " ChaosStuff</a>"
 msgstr ""
-#: c3l_membership/templates/index.html:103
+#: c3l_membership/templates/index.html:101
 msgid "Becoming a regular member gives you these additional benefits:"
 msgstr ""
-#: c3l_membership/templates/index.html:105
+#: c3l_membership/templates/index.html:103
 msgid "Voting rights on general assemblys"
 msgstr ""
 #: c3l_membership/templates/index.html:104
 msgid "Access to our internal mailinglist"
 msgstr ""
 #: c3l_membership/templates/index.html:106
 msgid "Access to our internal mailinglist"
 msgstr ""
 #: c3l_membership/templates/index.html:108
 msgid ""
 "You can read more on the membership <a "
 "href=\"https://wiki.c3l.lu/doku.php?id=organization:membership\">here</a>."
 msgstr ""
-#: c3l_membership/templates/index.html:109
+#: c3l_membership/templates/index.html:107
 msgid "What are the membership fees?"
 msgstr ""
-#: c3l_membership/templates/index.html:110
+#: c3l_membership/templates/index.html:108
 #, python-format
 msgid ""
 "The membership fee for the regular membership is %(regular_fee)s€ per "
@@ @@ -230,19 +224,40 @@ msgid "" @@
 "corresponding option."
 msgstr ""
-#: c3l_membership/templates/index.html:111
+#: c3l_membership/templates/index.html:109
 msgid "I cannot afford the membership?"
 msgstr ""
-#: c3l_membership/templates/index.html:112
+#: c3l_membership/templates/index.html:110
 msgid ""
 "If you cannot afford the membership, please contact us via info@c3l.lu "
 "first, before filling out the membership form. We will try to find a "
 "solution together."
 msgstr ""
 #: c3l_membership/templates/index.html:125
 msgid "Additional information"
 #: c3l_membership/templates/index.html:129
 msgid "Why do you ask for the birthday?"
 msgstr ""
 #: c3l_membership/templates/index.html:130
 msgid "This information helps us with a few different things:"
 msgstr ""
 #: c3l_membership/templates/index.html:132
 msgid ""
 "We need to know if you are underage. If so your legal representatives "
 "needs to sign this membership application."
 msgstr ""
 #: c3l_membership/templates/index.html:133
 msgid ""
 "We ask the city of Luxembourg every year for a financial grant and they "
 "ask how many members we have over the age of 26 and how many under the "
 "age of 26."
 msgstr ""
 #: c3l_membership/templates/index.html:137
 msgid "Additional information (Optional)"
 msgstr ""
 #: c3l_membership/templates/member.html:4

0 comments (0 inline, 0 general)