diff --git a/account/locale/de/LC_MESSAGES/django.mo b/account/locale/de/LC_MESSAGES/django.mo index 751f43f..8a968c1 100644 Binary files a/account/locale/de/LC_MESSAGES/django.mo and b/account/locale/de/LC_MESSAGES/django.mo differ diff --git a/account/locale/de/LC_MESSAGES/django.po b/account/locale/de/LC_MESSAGES/django.po index 4c38151..416919c 100644 --- a/account/locale/de/LC_MESSAGES/django.po +++ b/account/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-01 00:39+0100\n" +"POT-Creation-Date: 2025-04-01 00:10+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,118 +17,115 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: forms.py:14 +#: forms.py:31 msgid "Cookies must be enabled." msgstr "Cookies müssen aktiviert sein." -#: forms.py:21 +#: forms.py:40 msgid "Sorry, that login was invalid. Please try again." msgstr "Login fehlgeschlagen. Bitte versuche es nochmal." -#: forms.py:40 +#: forms.py:63 msgid "PIN must be 4 to 8 digits." msgstr "Die PIN muss aus 4-8 Ziffern bestehen." -#: forms.py:44 +#: forms.py:67 msgid "New Gastro-PIN" msgstr "Neue Gastro-PIN" -#: forms.py:45 +#: forms.py:69 msgid "Repeat Gastro-PIN" msgstr "Gastro-PIN wiederholen" -#: forms.py:46 forms.py:132 +#: forms.py:70 forms.py:177 msgid "Numerical only, 4 to 8 digits" msgstr "Nur Zahlen, 4-8 Ziffern" -#: forms.py:55 forms.py:119 +#: forms.py:79 forms.py:161 msgid "The PINs entered were not identical." msgstr "Die beiden eingegeben PINs waren nicht gleich." -#: forms.py:63 +#: forms.py:89 msgid "Enable WiFi presence" msgstr "WLAN-Präsenzerkennung einschalten" -#: forms.py:68 +#: forms.py:96 msgid "Old password" msgstr "Altes Passwort" -#: forms.py:69 +#: forms.py:98 msgid "Enter your current password here." msgstr "Hier kannst du dein Passwort ändern." -#: forms.py:71 forms.py:137 +#: forms.py:101 forms.py:197 msgid "New password" msgstr "Neues Passwort" -#: forms.py:73 forms.py:139 +#: forms.py:105 forms.py:202 msgid "Repeat password" msgstr "Passwort wiederholen" -#: forms.py:86 +#: forms.py:121 msgid "The old password was incorrect." msgstr "Das alte Passwort war inkorrekt." -#: forms.py:93 forms.py:158 +#: forms.py:130 forms.py:236 msgid "The new passwords were not identical." msgstr "Die beiden eingegeben Passwörter waren nicht identisch." -#: forms.py:97 forms.py:162 +#: forms.py:134 forms.py:241 msgid "Password must be at least 6 characters long" msgstr "Das Passwort muss aus mindestens sechs Zeichen bestehen." -#: forms.py:104 +#: forms.py:143 msgid "Your RFID" msgstr "Deine RFID" -#: forms.py:105 +#: forms.py:145 msgid "" "Find out your RFID by holding your RFID tag to the reader in the airlock." msgstr "" "Du kannst deine RFID herausfinden, in dem du eine nicht registrierte RFID-" "Karte an die Schleuse hältst." -#: forms.py:110 +#: forms.py:152 msgid "Your SIP PIN" msgstr "Deine SIP-PIN" -#: forms.py:111 +#: forms.py:153 msgid "Repeat SIP PIN" msgstr "SIP-PIN wiederholen" -#: forms.py:125 +#: forms.py:168 msgid "NRF24-ID" msgstr "NRF24-ID" -#: forms.py:126 +#: forms.py:169 msgid "Your r0ket's NRF24 identification" msgstr "Die NRF24-ID deiner r0ket" -#: forms.py:130 +#: forms.py:174 msgid "New indoor PIN" msgstr "Neue innentür-PIN" -#: forms.py:131 +#: forms.py:176 msgid "Repeat indoor PIN" msgstr "Innentür-PIN wiederholen" -#: forms.py:149 +#: forms.py:184 templates/member_base.html:37 templates/preferred_email.html:5 +msgid "Preferred e-mail" +msgstr "" + +#: forms.py:186 +msgid "" +"Forward my mail to this address. Leave empty to use the c-base IMAP and SMTP " +"servers." +msgstr "" + +#: forms.py:225 msgid "Select the username for whom you want to reset the password." msgstr "Zu editierendes Member auswählen." -#: views.py:132 views.py:221 -msgid "Your changes have been saved. Thank you!" -msgstr "Deine Änderungen wurden gespeichert. Vielen Dank!" - -#: views.py:190 -msgid "Your password was changed. Thank you!" -msgstr "Deine neue Passwort wurde gespeichert. Vielen Dank!" - -#: views.py:266 -#, python-format -msgid "The password for %s was changed. Thank you!" -msgstr "Das Passwort für %s wurde gespeichert. Danke!" - #: templates/access_denied.html:5 templates/member_base.html:13 #: templates/password.html:5 msgid "Password" @@ -148,15 +145,16 @@ msgstr "Hier kannst du das Passwort anderer Member setzen." #: templates/admin.html:18 templates/clabpin.html:18 #: templates/gastropin.html:23 templates/nrf24.html:19 -#: templates/password.html:18 templates/sippin.html:18 +#: templates/password.html:18 templates/preferred_email.html:18 +#: templates/sippin.html:18 msgid "Save" msgstr "Speichern" -#: templates/base.html:70 +#: templates/base.html:71 msgid "member interface" msgstr "" -#: templates/base.html:105 +#: templates/base.html:106 msgid "" "On this website any member can view and\n" " edit their data stored in the LDAP directory of\n" @@ -166,7 +164,7 @@ msgstr "" " seine im c-base LDAP hinterlegten Daten abrufen\n" " und editieren." -#: templates/base.html:110 +#: templates/base.html:111 msgid "" "If you are a new member and don't have a\n" " password yet, please contact one of the following people:" @@ -175,19 +173,19 @@ msgstr "" " Passwort hast, musst du dich an einen der folgenden " "Member wenden:" -#: templates/base.html:128 +#: templates/base.html:129 msgid "Sign in" msgstr "Login" -#: templates/base.html:137 +#: templates/base.html:138 msgid "Check crewname" msgstr "Crewnamen auf Verfügbarkeit prüfen" -#: templates/base.html:144 +#: templates/base.html:145 msgid "This crewname is already taken." msgstr "Dieser Crewname ist schon vergeben." -#: templates/base.html:148 +#: templates/base.html:149 msgid "This crewname is still available." msgstr "Dieser Crewname ist noch zu haben." @@ -239,7 +237,7 @@ msgstr "" "Hier kannst du einige deiner Parameter deines\n" " c-base Accounts ändern." -#: templates/home.html:13 +#: templates/home.html:13 templates/memberstatus.html:9 msgid "Basic information about your account" msgstr "Grundlegende Informationen über deinen Zugang" @@ -278,9 +276,19 @@ msgstr "Du bist Mitglied folgender LDAP Gruppen:" msgid "Management information" msgstr "Verwaltungsinformationen" -#: templates/home.html:41 -msgid "Name:" -msgstr "Name:" +#: templates/home.html:41 templates/memberstatus.html:13 +#, fuzzy +#| msgid "Check crewname" +msgid "Crewname:" +msgstr "Crewnamen auf Verfügbarkeit prüfen" + +#: templates/home.html:42 templates/memberstatus.html:14 +msgid "Membership Number:" +msgstr "" + +#: templates/home.html:43 templates/memberstatus.html:15 +msgid "Status:" +msgstr "" #: templates/home.html:45 msgid "External e-mail address:" @@ -302,13 +310,9 @@ msgstr "" "den\n" " Vorstand unter: " -#: templates/home.html:54 -msgid "Your c-base member account balance:" -msgstr "Dein c-base-Mitgliedskontostand" - #: templates/home.html:55 -msgid "Check balance" -msgstr "Kontostand überprüfen" +msgid "More" +msgstr "Mehr" #: templates/login.html:20 msgid "Login" @@ -334,18 +338,128 @@ msgstr "" msgid "Indoor-PIN" msgstr "Innentür-PIN" -#: templates/member_base.html:33 templates/nrf24.html:5 -msgid "NRF24" -msgstr "NRF24" - -#: templates/member_base.html:37 -msgid "SIP-PIN" -msgstr "SIP-PIN" +#: templates/member_base.html:33 +msgid "Memberstatus" +msgstr "" #: templates/member_base.html:44 msgid "Admin" msgstr "Admin" +#: templates/memberstatus.html:16 +msgid "Firstname:" +msgstr "" + +#: templates/memberstatus.html:17 +msgid "Lastname:" +msgstr "" + +#: templates/memberstatus.html:18 +msgid "Street:" +msgstr "" + +#: templates/memberstatus.html:19 +msgid "Postcode:" +msgstr "" + +#: templates/memberstatus.html:20 +msgid "City:" +msgstr "" + +#: templates/memberstatus.html:21 +msgid "Gender:" +msgstr "" + +#: templates/memberstatus.html:22 +msgid "Birth Date:" +msgstr "" + +#: templates/memberstatus.html:23 +msgid "Entry Date:" +msgstr "" + +#: templates/memberstatus.html:24 +msgid "Godfather:" +msgstr "" + +#: templates/memberstatus.html:25 +msgid "Payment Method:" +msgstr "" + +#: templates/memberstatus.html:26 +msgid "Payment Frequency:" +msgstr "" + +#: templates/memberstatus.html:27 +msgid "Debit Authorization:" +msgstr "" + +#: templates/memberstatus.html:28 +msgid "Bank:" +msgstr "" + +#: templates/memberstatus.html:29 +msgid "IBAN:" +msgstr "" + +#: templates/memberstatus.html:30 +msgid "BIC:" +msgstr "" + +#: templates/memberstatus.html:41 +msgid "" +"DISCLAIMER: due to crappy association management software, the data below is " +"only a rough estimate. c-base cannot take responsibility for the correctness " +"of this information." +msgstr "" + +#: templates/memberstatus.html:47 +msgid "Contributions:" +msgstr "" + +#: templates/memberstatus.html:51 +msgid "Total" +msgstr "" + +#: templates/memberstatus.html:55 templates/memberstatus.html:68 +#: templates/memberstatus.html:97 templates/memberstatus.html:108 +msgid "Billed:" +msgstr "" + +#: templates/memberstatus.html:56 templates/memberstatus.html:69 +#: templates/memberstatus.html:98 templates/memberstatus.html:109 +msgid "Paid:" +msgstr "" + +#: templates/memberstatus.html:57 templates/memberstatus.html:70 +#: templates/memberstatus.html:99 templates/memberstatus.html:110 +msgid "Unpaid:" +msgstr "" + +#: templates/memberstatus.html:76 templates/memberstatus.html:120 +msgid "no data available" +msgstr "" + +#: templates/memberstatus.html:84 +msgid "Contracts:" +msgstr "" + +#: templates/memberstatus.html:93 +msgid "Type:" +msgstr "" + +#: templates/memberstatus.html:94 +msgid "Total:" +msgstr "" + +#: templates/memberstatus.html:103 +msgid "Sums:" +msgstr "" + +#: templates/nrf24.html:5 +msgid "NRF24" +msgstr "NRF24" + #: templates/nrf24.html:8 msgid "" "The NRF24 identification is used to interface with the\n" @@ -358,6 +472,10 @@ msgstr "" msgid "You can change your password here." msgstr "Hier kannst du dein Passwort ändern." +#: templates/preferred_email.html:8 +msgid "The e-mail address that you want your c-base mail forwarded to." +msgstr "" + #: templates/rfid.html:8 msgid "" "A Radio Frequency Identification (RFID) tag can be used\n" @@ -402,3 +520,28 @@ msgstr "" "Die WLAN-Präsenzerkennung meldet dich automatisch\n" " bei der c-base an, sobald du ein Gerät mit dem Crew-WLAN\n" " (SSID: c-base-crew) mit deinem Usernamen und Passwort verbindest." + +#: views.py:161 views.py:282 +msgid "Your changes have been saved. Thank you!" +msgstr "Deine Änderungen wurden gespeichert. Vielen Dank!" + +#: views.py:246 +msgid "Your password was changed. Thank you!" +msgstr "Deine neue Passwort wurde gespeichert. Vielen Dank!" + +#: views.py:341 +#, python-format +msgid "The password for %s was changed. Thank you!" +msgstr "Das Passwort für %s wurde gespeichert. Danke!" + +#~ msgid "Name:" +#~ msgstr "Name:" + +#~ msgid "Your c-base member account balance:" +#~ msgstr "Dein c-base-Mitgliedskontostand" + +#~ msgid "Check balance" +#~ msgstr "Kontostand überprüfen" + +#~ msgid "SIP-PIN" +#~ msgstr "SIP-PIN" diff --git a/account/templates/home.html b/account/templates/home.html index 1c8f75f..e73fb8d 100644 --- a/account/templates/home.html +++ b/account/templates/home.html @@ -35,38 +35,25 @@ {% endfor %} + + - {% trans "Firstname:" %}{{ cteward.Vorname }} - {% trans "Lastname:" %}{{ cteward.Nachname }} - {% trans "Street:" %}{{ cteward.Strasse }} - {% trans "Postcode:" %}{{ cteward.PLZ }} - {% trans "City:" %}{{ cteward.Ort }} - {% trans "Gender:" %}{{ cteward.Geschlecht }} - {% trans "Birth Date:" %}{{ cteward.Geburtsdatum }} - {% trans "Entry Date:" %}{{ cteward.Eintritt }} - {% trans "Godfather:" %}{{ cteward.Paten }} - {% trans "Payment Method:" %}{{ cteward.Zahlungsart }} - {% trans "Payment Frequency:" %}{{ cteward.Zahlungsweise }} - {% trans "Debit Authorization:" %}{{ cteward.Lastschriftmandat }} - {% trans "Bank:" %}{{ cteward.Bank }} - {% trans "IBAN:" %}{{ cteward.IBAN }} - {% trans "BIC:" %}{{ cteward.BIC }} + {% trans "More" %} +--> {% endblock container %} diff --git a/account/templates/member_base.html b/account/templates/member_base.html index f1707eb..071d36d 100644 --- a/account/templates/member_base.html +++ b/account/templates/member_base.html @@ -28,13 +28,9 @@
  • {% trans "Indoor-PIN" %}
    • - {% url 'nrf24' as nrf24_url %} -
  • - {% trans "NRF24" %} -
    • - {% url 'sippin' as sippin_url %} -
  • - {% trans "SIP-PIN" %} + {% url 'memberstatus' as memberstatus_url %} +
  • + {% trans "Memberstatus" %}
    • {% url 'preferred_email' as preferred_email_url %}
  • @@ -54,7 +50,7 @@
    - Copyright © 2015 by c-base e.V. + Copyright © 2025 by c-base e.V.
    {% endblock body %} diff --git a/account/views.py b/account/views.py index b029e8c..b839098 100755 --- a/account/views.py +++ b/account/views.py @@ -87,7 +87,7 @@ def home(request): number_of_members = member.get_number_of_members() password = get_ldap_password(request) username = request.user.username - url = "https://vorstand.c-base.org/cteward-api/legacy/member/%s" % username + url = "https://vorstand.cbrp3.c-base.org/cteward-api/legacy/member/%s" % username cteward = None try: r = requests.get(