smile/cbmi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3 from berlincount/bugfix

Browse source 
Bugfix: wrong mailaddress, broken c-portal submodule
This commit is contained in:
baccenfutter 2014-11-28 23:53:17 +01:00
commit c687310024
6 changed files with 33 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -3,3 +3,4 @@
local_settings.py local_settings.py
build build
*.sqlite3 *.sqlite3
*~

2
.gitmodules vendored
View file

@ -1,3 +1,3 @@
[submodule "static/c-base-bootstrap"] [submodule "static/c-base-bootstrap"]
path = static/c-base-bootstrap path = static/c-base-bootstrap
url = git://dev.c-base.org/c-portal/c-portal-bootstrap.git url = https://github.com/c-base/c-base-bootstrap.git

63
account/locale/de/LC_MESSAGES/django.po
View file

@ -19,16 +19,15 @@ msgstr ""
#: forms.py:14 #: forms.py:14
msgid "Cookies must be enabled." msgid "Cookies must be enabled."
msgstr "Cookies muessen aktiviert sein." msgstr "Cookies müssen aktiviert sein."
#: forms.py:21 #: forms.py:21
msgid "Sorry, that login was invalid. Please try again." msgid "Sorry, that login was invalid. Please try again."
msgstr "Login fehlgeschlagen. Bitte versuche es nochmal." msgstr "Login fehlgeschlagen. Bitte versuche es nochmal."
#: forms.py:40 #: forms.py:40
#, fuzzy
msgid "PIN must be 4 to 8 digits." msgid "PIN must be 4 to 8 digits."
msgstr "Die PIN muss 4 - 6 Ziffern enthalten." msgstr "Die PIN muss aus 4-8 Ziffern bestehen."
#: forms.py:44 #: forms.py:44
msgid "New Gastro-PIN" msgid "New Gastro-PIN"
@ -39,9 +38,8 @@ msgid "Repeat Gastro-PIN"
msgstr "Gastro-PIN wiederholen" msgstr "Gastro-PIN wiederholen"
#: forms.py:46 forms.py:132 #: forms.py:46 forms.py:132
#, fuzzy
msgid "Numerical only, 4 to 8 digits" msgid "Numerical only, 4 to 8 digits"
msgstr "Nur Zahlen, 4 bis 6 Ziffern lang" msgstr "Nur Zahlen, 4-8 Ziffern"
#: forms.py:55 forms.py:119 #: forms.py:55 forms.py:119
msgid "The PINs entered were not identical." msgid "The PINs entered were not identical."
@ -52,12 +50,10 @@ msgid "Enable WiFi presence"
msgstr "WLAN-Präsenzerkennung einschalten" msgstr "WLAN-Präsenzerkennung einschalten"
#: forms.py:68 #: forms.py:68
#, fuzzy
msgid "Old password" msgid "Old password"
msgstr "Neues Passwort" msgstr "Neues Passwort"
#: forms.py:69 #: forms.py:69
#, fuzzy
msgid "Enter your current password here." msgid "Enter your current password here."
msgstr "Hier kannst du dein Passwort ändern." msgstr "Hier kannst du dein Passwort ändern."
@ -74,9 +70,8 @@ msgid "The old password was incorrect."
msgstr "Das alte Passwort war inkorrekt." msgstr "Das alte Passwort war inkorrekt."
#: forms.py:93 forms.py:158 #: forms.py:93 forms.py:158
#, fuzzy
msgid "The new passwords were not identical." msgid "The new passwords were not identical."
msgstr "Die beiden eingegeben Passwoerter waren nicht identisch." msgstr "Die beiden eingegeben Passwörter waren nicht identisch."
#: forms.py:97 forms.py:162 #: forms.py:97 forms.py:162
msgid "Password must be at least 6 characters long" msgid "Password must be at least 6 characters long"
@ -119,21 +114,20 @@ msgstr "c-lab-PIN wiederholen"
#: forms.py:149 #: forms.py:149
msgid "Select the username for whom you want to reset the password." msgid "Select the username for whom you want to reset the password."
msgstr "Zu editierendes Member auswaehlen." msgstr "Zu editierendes Member auswählen."
#: views.py:132 views.py:221 #: views.py:132 views.py:221
msgid "Your changes have been saved. Thank you!" msgid "Your changes have been saved. Thank you!"
msgstr "Deine Änderungen wurden gespeichert. Vielen Dank!" msgstr "Deine Änderungen wurden gespeichert. Vielen Dank!"
#: views.py:190 #: views.py:190
#, fuzzy
msgid "Your password was changed. Thank you!" msgid "Your password was changed. Thank you!"
msgstr "Deine Änderungen wurden gespeichert. Vielen Dank!" msgstr "Deine neue Passwort wurde gespeichert. Vielen Dank!"
#: views.py:266 #: views.py:266
#, python-format #, python-format
msgid "The password for %s was changed. Thank you!" msgid "The password for %s was changed. Thank you!"
msgstr "Das Passwort fuer %s wurde gespeichert. Danke!" msgstr "Das Passwort für %s wurde gespeichert. Danke!"
#: templates/access_denied.html:5 templates/member_base.html:13 #: templates/access_denied.html:5 templates/member_base.html:13
#: templates/password.html:5 #: templates/password.html:5
@ -145,12 +139,10 @@ msgid "ACCESS DENIED"
msgstr "ZUGRIFF VERWEIGERT" msgstr "ZUGRIFF VERWEIGERT"
#: templates/admin.html:5 #: templates/admin.html:5
#, fuzzy
msgid "Admin Password" msgid "Admin Password"
msgstr "Admin Passwort" msgstr "Adminpasswort"
#: templates/admin.html:8 #: templates/admin.html:8
#, fuzzy
msgid "You can change other users passwords here." msgid "You can change other users passwords here."
msgstr "Hier kannst du das Passwort anderer Member setzen." msgstr "Hier kannst du das Passwort anderer Member setzen."
@ -188,17 +180,16 @@ msgid "Sign in"
msgstr "Login" msgstr "Login"
#: templates/base.html:137 #: templates/base.html:137
#, fuzzy msgid "Check crewname"
msgid "Check nick" msgstr "Crewnamen auf Verfügbarkeit prüfen"
msgstr "Freien Nicknamen pruefen"
#: templates/base.html:144 #: templates/base.html:144
msgid "This nick is already taken." msgid "This crewname is already taken."
msgstr "Dieser Nickname ist schon vergeben." msgstr "Dieser Crewname ist schon vergeben."
#: templates/base.html:148 #: templates/base.html:148
msgid "This nick is still available." msgid "This crewname is still available."
msgstr "Dieser Nickname ist noch zu haben." msgstr "Dieser Crewname ist noch zu haben."
#: templates/clabpin.html:5 #: templates/clabpin.html:5
msgid "c-lab PIN" msgid "c-lab PIN"
@ -246,7 +237,7 @@ msgid ""
" c-base member account." " c-base member account."
msgstr "" msgstr ""
"Hier kannst du einige deiner Parameter deines\n" "Hier kannst du einige deiner Parameter deines\n"
" c-base Accounts aendern." " c-base Accounts ändern."
#: templates/home.html:13 #: templates/home.html:13
msgid "Basic information about your account" msgid "Basic information about your account"
@ -261,7 +252,6 @@ msgid "Numeric user ID:"
msgstr "Numerische Nutzer-ID:" msgstr "Numerische Nutzer-ID:"
#: templates/home.html:21 #: templates/home.html:21
#, fuzzy
msgid "" msgid ""
"The numeric user ID can\n" "The numeric user ID can\n"
" be used to login with the vending machines and " " be used to login with the vending machines and "
@ -270,15 +260,15 @@ msgid ""
msgstr "" msgstr ""
"Die numerische Nutzer-ID kann zur Anmeldung\n" "Die numerische Nutzer-ID kann zur Anmeldung\n"
" an den Getränkeautomaten und Netzwerkverbundenen\n" " an den Getränkeautomaten und Netzwerkverbundenen\n"
" Kodeschlössern benutzt werden." " Codeschlössern benutzt werden."
#: templates/home.html:25 #: templates/home.html:25
msgid "Your c-base e-mail address:" msgid "Your c-base e-mail address:"
msgstr "Deine c-base-e-Mail-Adresse" msgstr "Deine c-base-e-Mail-Adresse:"
#: templates/home.html:30 #: templates/home.html:30
msgid "Your group memberships" msgid "Your group memberships"
msgstr "Deine Gruppenzugehoerigkeiten" msgstr "Deine Gruppenzugehörigkeiten"
#: templates/home.html:31 #: templates/home.html:31
msgid "You are part of the following LDAP groups:" msgid "You are part of the following LDAP groups:"
@ -294,7 +284,7 @@ msgstr "Name:"
#: templates/home.html:45 #: templates/home.html:45
msgid "External e-mail address:" msgid "External e-mail address:"
msgstr "Externe e-Mail-Adresse" msgstr "Externe e-Mail-Adresse:"
#: templates/home.html:47 #: templates/home.html:47
msgid "" msgid ""
@ -305,10 +295,10 @@ msgid ""
"via " "via "
msgstr "" msgstr ""
"Die externe E-Mail Adresse wird vom Vorstand\n" "Die externe E-Mail Adresse wird vom Vorstand\n"
" verwendet, um dich in Situationen erreichen zu koennen,\n" " verwendet, um dich in Situationen erreichen zu können,\n"
" in denen deine interne c-mail Adresse nicht " " in denen deine interne c-mail Adresse nicht "
"funktioniert.\n" "funktioniert.\n"
" Um deine externe E-Mail zu aendern, kontaktiere bitte " " Um deine externe E-Mail zu ändern, kontaktiere bitte "
"den\n" "den\n"
" Vorstand unter: " " Vorstand unter: "
@ -341,21 +331,20 @@ msgid "RFID"
msgstr "" msgstr ""
#: templates/member_base.html:29 #: templates/member_base.html:29
#, fuzzy
msgid "c-lab-PIN" msgid "c-lab-PIN"
msgstr "c-lab-PIN" msgstr "c-lab-PIN"
#: templates/member_base.html:33 templates/nrf24.html:5 #: templates/member_base.html:33 templates/nrf24.html:5
msgid "NRF24" msgid "NRF24"
msgstr "" msgstr "NRF24"
#: templates/member_base.html:37 #: templates/member_base.html:37
msgid "SIP-PIN" msgid "SIP-PIN"
msgstr "" msgstr "SIP-PIN"
#: templates/member_base.html:44 #: templates/member_base.html:44
msgid "Admin" msgid "Admin"
msgstr "" msgstr "Admin"
#: templates/nrf24.html:8 #: templates/nrf24.html:8
msgid "" msgid ""
@ -386,7 +375,7 @@ msgstr ""
"Schleusenterminal\n" "Schleusenterminal\n"
" begrüßen und dir weitere Informationen anzeigen. Wenn du dein RFID-Tag " " begrüßen und dir weitere Informationen anzeigen. Wenn du dein RFID-Tag "
"nochmal\n" "nochmal\n"
" beim Verlassen der Raumstation auf den Leser hätst, wirst du Abgemeldet." " beim Verlassen der Raumstation auf den Leser hältst, wirst du Abgemeldet."
#: templates/sippin.html:5 #: templates/sippin.html:5
msgid "SIP PIN" msgid "SIP PIN"
@ -410,6 +399,6 @@ msgid ""
"Wifi\n" "Wifi\n"
" (SSID: c-base-crew) with your username and password." " (SSID: c-base-crew) with your username and password."
msgstr "" msgstr ""
"Die WLAN-Präsenzerkennung medlet dich automatisch\n" "Die WLAN-Präsenzerkennung meldet dich automatisch\n"
" bei der c-base an, sobald du ein Gerät mit dem Crew-WLAN\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." " (SSID: c-base-crew) mit deinem Usernamen und Passwort verbindest."

6
account/templates/base.html
View file

@ -134,18 +134,18 @@
<input type="text" id="check_nickname" name="check_nickname"> <input type="text" id="check_nickname" name="check_nickname">
<div class="control-group"> <div class="control-group">
<div class="controls"> <div class="controls">
<button type="submit" class="btn">{% trans "Check nick" %}</button> <button type="submit" class="btn">{% trans "Check crewname" %}</button>
</div> </div>
</div> </div>
</form> </form>
{% if not check_nickname == "" %} {% if not check_nickname == "" %}
{% if check_nickname %} {% if check_nickname %}
<div class="alert alert-danger alert-block"> <div class="alert alert-danger alert-block">
{% blocktrans %}This nick is already taken.{% endblocktrans %} {% blocktrans %}This crewname is already taken.{% endblocktrans %}
</div> </div>
{% else %} {% else %}
<div class="alert alert-success alert-block"> <div class="alert alert-success alert-block">
{% blocktrans %}This nick is still available.{% endblocktrans %} {% blocktrans %}This crewname is still available.{% endblocktrans %}
</div> </div>
{% endif %} {% endif %}
{% endif %} {% endif %}

6
account/templates/home.html
View file

@ -48,11 +48,7 @@
board of c-base to reach you in cases where your c-base board of c-base to reach you in cases where your c-base
address (see above) is not working. To change your address (see above) is not working. To change your
external e-mail address please contact the c-base board via {% endblocktrans %} external e-mail address please contact the c-base board via {% endblocktrans %}
(<a href="mailto:vorstand@c-base.org">vorstand@c-base.org</a>).</span> (<a href="mailto:cash@c-base.org">cash@c-base.org</a>).</span>
</li>
<li>
{% trans "Your c-base member account balance:" %}
<a class="btn btn-small" href="https://vorstand.c-base.org/member/">{% trans "Check balance" %}</a>
</li> </li>
</ul> </ul>

2
static/c-base-bootstrap

@ -1 +1 @@
Subproject commit 279f25a00dc1ee300009350a1ddc59963cef0da8 Subproject commit c3e28df3bd5ce35af7c8e9e2a6f19e15139dbc11