User must confirm that he have read and understood the privacy plicity. This policity and the stautes are now linked in the help_text.

src/membership/admin.py

@@ -92,9 +92,9 @@ class MembershipAdmin(UserAdmin):
         'is_active',
         'membership',
         'confirmed',
-        'paid_until',
+        'last_login',
     )
-    list_editable = ('confirmed', 'paid_until',)
+    list_editable = ('confirmed', )
     list_display_links = ('username',)
     fieldsets = (
         (None, {'fields': (('username', 'password'), 'gender', 'avatar',

src/membership/locale/de/LC_MESSAGES/django.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kasu.membership\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-05-04 11:29+0200\n"
+"POT-Creation-Date: 2018-05-08 00:17+0200\n"
-"PO-Revision-Date: 2018-05-04 11:31+0105\n"
+"PO-Revision-Date: 2018-05-08 00:19+0105\n"
 "Last-Translator: b'Christian Berg <kasu@xendynastie.at>'\n"
 "Language-Team: Kasu <verein@kasu.at>\n"
 "Language: de\n"
@@ -17,173 +17,200 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.8.9\n"
-"X-Translated-Using: django-rosetta 0.7.14\n"
+"X-Translated-Using: django-rosetta 0.8.1\n"
 
-#: __init__.py:11
+#: .\membership\__init__.py:11
 msgid "Male"
 msgstr "Männlich"
 
-#: __init__.py:12
+#: .\membership\__init__.py:12
 msgid "Female"
 msgstr "Weiblich"
 
-#: admin.py:22
+#: .\membership\admin.py:22
 msgid "Activate selected User"
 msgstr "Ausgewählte Benutzer freischalten"
 
-#: admin.py:39
+#: .\membership\admin.py:39
 msgid "Cleanup selected Activation Requests"
 msgstr "Ausgewählte Aktivierungsanfragen bereinigen"
 
-#: admin.py:62
+#: .\membership\admin.py:62
 #, python-format
 msgid "Can't remove personal data from active member %s."
 msgstr ""
 "Persönliche Daten von aktiven Mitglied %s können nicht entfernt werden."
 
-#: admin.py:64
+#: .\membership\admin.py:64
 #, python-format
 msgid "Cleared %d personal data profiles."
 msgstr "Persönliche Daten in %d Profilen entfernt."
 
-#: admin.py:66
+#: .\membership\admin.py:66
 msgid "Clear personal Data"
 msgstr "Persönliche Daten bereinigen"
 
-#: admin.py:75
+#: .\membership\admin.py:75
 msgid "Group"
 msgstr "Gruppe"
 
-#: admin.py:76
+#: .\membership\admin.py:76
 msgid "Groups"
 msgstr "Gruppen"
 
-#: admin.py:102 models.py:163 models.py:218
+#: .\membership\admin.py:102 .\membership\forms.py:78
+#: .\membership\models.py:163 .\membership\models.py:218
 msgid "Membership"
 msgstr "Mitgliedschaft"
 
-#: admin.py:107
+#: .\membership\admin.py:107
 msgid "Permissions"
 msgstr "Berechtigung"
 
-#: admin.py:109
+#: .\membership\admin.py:109
 msgid "Important dates"
 msgstr "Wichtige Daten"
 
-#: forms.py:23 templates/membership/membership_detail.html:46
+#: .\membership\forms.py:24
+#: .\membership\templates\membership\membership_detail.html:46
 msgid "birthday"
 msgstr "Geburtstag"
 
-#: forms.py:25
+#: .\membership\forms.py:26
 msgid "Input format: yyyy-mm-dd"
 msgstr "Eingabeformat: tt.mm.jjjj"
 
-#: forms.py:27 templates/membership/membership_detail.html:49
+#: .\membership\forms.py:28
+#: .\membership\templates\membership\membership_detail.html:48
 msgid "Email"
 msgstr "E-Mail"
 
-#: forms.py:44
+#: .\membership\forms.py:45
 msgid ""
 "For your membership, we need this.             Please fill out this field "
 "yet."
 msgstr "Diese Angabe wird für eine Mitgliedschaft benötigt, bitte ausfüllen."
 
-#: forms.py:68
+#: .\membership\forms.py:69
 msgid "password"
 msgstr "Passwort"
 
-#: forms.py:70
+#: .\membership\forms.py:71
 msgid "password (again)"
 msgstr "Passwort (wiederholen)"
 
-#: forms.py:92
+#: .\membership\forms.py:73
+msgid "Privacy policy"
+msgstr "Datenschutzerklärung"
+
+#: .\membership\forms.py:75
+#, python-format
+msgid "I have read and understood the <a href=\"%s\">privacy policy</a>"
+msgstr ""
+"Ich habe die <a href=\"%s\"> Datenschutzerklärung</a> gelesen und verstanden"
+
+#: .\membership\forms.py:80
+#, python-format
+#| msgid ""
+#| "Yes, I confirm that I am in agreement with the statutes         and would "
+#| "like to become a member."
+msgid ""
+"Yes, I confirm that I am in agreement with the <a href=\"%s\">statutes</a> "
+"and would like to become a member."
+msgstr ""
+"Ja, ich bin mit den <a href=\"%s\">Statuen</a> einverstanden und möchte "
+"Mitglied werden."
+
+#: .\membership\forms.py:105
 msgid "This username is already taken.         Please choose another."
 msgstr ""
 "Diesen Benutzername ist schon vergeben. Bitte einen anderen auswählen."
 
-#: forms.py:99
+#: .\membership\forms.py:112
 msgid ""
 "This email address is already in             use. Please supply a different "
 "email address."
 msgstr "Die E-Mail Adresse wird schon verwendet. Bitte eine andere angeben."
 
-#: forms.py:109
+#: .\membership\forms.py:122
 msgid "The two password fields didn't match."
 msgstr "Die beiden Passwörter passen nicht."
 
-#: models.py:84
+#: .\membership\models.py:84
 msgid "user"
 msgstr "Benutzer"
 
-#: models.py:86
+#: .\membership\models.py:86
 msgid "activation key"
 msgstr "Aktivierungsschlüssel"
 
-#: models.py:90
+#: .\membership\models.py:90
 msgid "pending activation"
 msgstr "Ausstehende Aktivierung"
 
-#: models.py:91
+#: .\membership\models.py:91
 msgid "pending activations"
 msgstr "Wartende Aktivierungen"
 
-#: models.py:94
+#: .\membership\models.py:94
 #, python-format
 msgid "user registration for %s"
 msgstr "Benutzerregistrierung für %s"
 
-#: models.py:149
+#: .\membership\models.py:149
 msgid "Gender"
 msgstr "Geschlecht"
 
-#: models.py:165
+#: .\membership\models.py:165
 msgid ""
 "Yes, I confirm that I am in agreement with the statutes         and would "
 "like to become a member."
 msgstr "Ja, ich bin mit den Statuen einverstanden und möchte Mitglied werden."
 
-#: models.py:169
+#: .\membership\models.py:169
 msgid "Birthday Date"
 msgstr "Geburtstag"
 
-#: models.py:173 templates/membership/membership_detail.html:50
+#: .\membership\models.py:173
+#: .\membership\templates\membership\membership_detail.html:49
 msgid "Telephone"
 msgstr "Telefon"
 
-#: models.py:179 templates/membership/membership_detail.html:47
+#: .\membership\models.py:179
+#: .\membership\templates\membership\membership_detail.html:47
 msgid "Address"
 msgstr "Adresse"
 
-#: models.py:185
+#: .\membership\models.py:185
 msgid "Postcode"
 msgstr "Postleitzahl"
 
-#: models.py:190
+#: .\membership\models.py:190
 msgid "Town/City"
 msgstr "Ort"
 
-#: models.py:198
+#: .\membership\models.py:198
 msgid "Paid until"
 msgstr "Bezahlt bis"
 
-#: models.py:204
+#: .\membership\models.py:204
 msgid "Confirmed"
 msgstr "Bestätigt"
 
-#: models.py:206
+#: .\membership\models.py:206
 msgid "This person has paid the membership fee."
 msgstr "Diese Person hat ihre Mitgliedschaft bezahlt"
 
-#: models.py:219
+#: .\membership\models.py:219
 msgid "Memberships"
 msgstr "Mitgliedschaften"
 
-#: templates/membership/email/activation_email.txt:2
+#: .\membership\templates\membership\email\activation_email.txt:2
 #, python-format
 msgid "Welcome %(user)s,"
 msgstr "Herzlich willkommen %(user)s,"
 
-#: templates/membership/email/activation_email.txt:4
+#: .\membership\templates\membership\email\activation_email.txt:4
 #, python-format
 msgid ""
 "We received an account request on %(site.domain)s for your email address.\n"
@@ -192,7 +219,7 @@ msgstr ""
 "Jemand (hoffentlich du selbst) möchte mit dieser E-Mail Adresse einen neuen Benutzer Account für %(site.domain)s anlegen.\n"
 "Solltest du diesen Account aktivieren wollen, klicke bitte auf den unten stehenden Link, oder kopiere diesen in die Adresszeile deines Browsers:"
 
-#: templates/membership/email/activation_email.txt:9
+#: .\membership\templates\membership\email\activation_email.txt:9
 #, python-format
 msgid ""
 "If you do not want to open an account on %(site.domain)s, please ignore this email.\n"
@@ -201,7 +228,7 @@ msgstr ""
 "Wenn du keinen Zugang für %(site.domain)s eröffnen willst, ignoriere diese E-Mail bitte.\n"
 "Die Zugangsdaten werden dann in ein paar Tagen automatisch gelöscht."
 
-#: templates/membership/email/activation_email.txt:12
+#: .\membership\templates\membership\email\activation_email.txt:12
 #, python-format
 msgid ""
 "Best Regards,\n"
@@ -210,259 +237,230 @@ msgstr ""
 "mit den besten Wünschen\n"
 "Das Team von %(site.domain)s"
 
-#: templates/membership/email/password_reset_email.html:2
+#: .\membership\templates\membership\email\password_reset_email.html:2
 msgid "You're receiving this e-mail because you requested a password reset"
 msgstr ""
 "Du hast diese E-Mail erhalten, weil jemand die das Passwort zurücksetzen "
 "möchte. "
 
-#: templates/membership/email/password_reset_email.html:3
+#: .\membership\templates\membership\email\password_reset_email.html:3
 #, python-format
 msgid "for your user account at %(site_name)s"
 msgstr "Für deinen Benutzerzugang auf %(site_name)s"
 
-#: templates/membership/email/password_reset_email.html:5
+#: .\membership\templates\membership\email\password_reset_email.html:5
 msgid "Please go to the following page and choose a new password:"
 msgstr "Bitte gehe auf folgende Seite und wähle ein neues Passwort aus:"
 
-#: templates/membership/email/password_reset_email.html:9
+#: .\membership\templates\membership\email\password_reset_email.html:9
 msgid "Your username, in case you've forgotten:"
 msgstr "Dein Benutzername, für den Fall das du diesen vergessen hast:"
 
-#: templates/membership/email/password_reset_email.html:11
+#: .\membership\templates\membership\email\password_reset_email.html:11
 msgid "Thanks for using our site!"
 msgstr "Danke das du unsere Seite verwendest!"
 
-#: templates/membership/email/password_reset_email.html:13
+#: .\membership\templates\membership\email\password_reset_email.html:13
 #, python-format
 msgid "The %(site_name)s team"
 msgstr "Das %(site_name)s Team"
 
-#: templates/membership/email/password_reset_subject.txt:2
+#: .\membership\templates\membership\email\password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
 msgstr "Passwort auf %(site_name)s zurücksetzen"
 
-#: templates/membership/hanchan_table.html:5
+#: .\membership\templates\membership\hanchan_table.html:5
 msgid "Start"
 msgstr "Beginn"
 
-#: templates/membership/hanchan_table.html:6
+#: .\membership\templates\membership\hanchan_table.html:6
 msgid "Event"
 msgstr "Termin"
 
-#: templates/membership/hanchan_table.html:7
+#: .\membership\templates\membership\hanchan_table.html:7
 msgid "Players"
 msgstr "Spieler"
 
-#: templates/membership/hanchan_table.html:8
+#: .\membership\templates\membership\hanchan_table.html:8
 msgid "Kyu Points"
 msgstr "Kyū Punkte"
 
-#: templates/membership/hanchan_table.html:9
+#: .\membership\templates\membership\hanchan_table.html:9
 msgid "Dan Points"
 msgstr "Dan Punkte"
 
-#: templates/membership/hanchan_table.html:10
+#: .\membership\templates\membership\hanchan_table.html:10
 msgid "Bonus Points"
 msgstr "Bonus Punkte"
 
-#: templates/membership/hanchan_table.html:11
+#: .\membership\templates\membership\hanchan_table.html:11
 msgid "Comment"
 msgstr "Anmerkung"
 
-#: templates/membership/hanchan_table.html:26
+#: .\membership\templates\membership\hanchan_table.html:26
 msgid "This Hanchan does not validate"
 msgstr "Diese Hanchan ist ungültig"
 
-#: templates/membership/membership_detail.html:5
+#: .\membership\templates\membership\membership_detail.html:5
 msgid "profile for"
 msgstr "Profil für"
 
-#: templates/membership/membership_detail.html:9
+#: .\membership\templates\membership\membership_detail.html:9
 msgid "Ladder Hanchans"
 msgstr "Ladder Hanchans"
 
-#: templates/membership/membership_detail.html:10
+#: .\membership\templates\membership\membership_detail.html:10
 msgid "Kyu Hanchans"
 msgstr "Kyū Hanchans"
 
-#: templates/membership/membership_detail.html:11
+#: .\membership\templates\membership\membership_detail.html:11
 msgid "Dan Hanchans"
 msgstr "Dan Hanchans"
 
-#: templates/membership/membership_detail.html:12
+#: .\membership\templates\membership\membership_detail.html:12
 msgid "Invalid Hanchans"
 msgstr "Ungültige Hanchans"
 
-#: templates/membership/membership_detail.html:13
+#: .\membership\templates\membership\membership_detail.html:13
 msgid "Mai-Star Games"
 msgstr "Mai-Star Spiele"
 
-#: templates/membership/membership_detail.html:17
+#: .\membership\templates\membership\membership_detail.html:17
 msgid "Profile Image"
 msgstr "Profilbild"
 
-#: templates/membership/membership_detail.html:26
+#: .\membership\templates\membership\membership_detail.html:26
-#: templates/membership/membership_detail.html:29
+#: .\membership\templates\membership\membership_detail.html:29
 msgid "Points"
 msgstr "Punkte"
 
-#: templates/membership/membership_detail.html:26
+#: .\membership\templates\membership\membership_detail.html:26
 msgid "Maximum"
 msgstr "Maximum"
 
-#: templates/membership/membership_detail.html:32
+#: .\membership\templates\membership\membership_detail.html:32
 msgid "Games Total"
 msgstr "Spiele gesamt"
 
-#: templates/membership/membership_detail.html:32
+#: .\membership\templates\membership\membership_detail.html:32
-#: templates/membership/membership_detail.html:35
+#: .\membership\templates\membership\membership_detail.html:35
 msgid "Won"
 msgstr "Gewonnen"
 
-#: templates/membership/membership_detail.html:32
+#: .\membership\templates\membership\membership_detail.html:32
-#: templates/membership/membership_detail.html:35
+#: .\membership\templates\membership\membership_detail.html:35
 msgid "Good"
 msgstr "Gut"
 
-#: templates/membership/membership_detail.html:35
+#: .\membership\templates\membership\membership_detail.html:35
 msgid "Current Season"
 msgstr "Aktuelle Saison"
 
-#: templates/membership/membership_detail.html:42
+#: .\membership\templates\membership\membership_detail.html:42
 msgid "private data"
 msgstr "Private Daten"
 
-#: templates/membership/membership_detail.html:43
+#: .\membership\templates\membership\membership_detail.html:43
 msgid "This data can only be seen by yourself and members of the board."
 msgstr ""
 "Diese Angaben können nur von dir selbst und von Mitgliedern des Vorstandes "
 "eingesehen werden."
 
-#: templates/membership/membership_detail.html:45
+#: .\membership\templates\membership\membership_detail.html:45
 msgid "name"
 msgstr "Name"
 
-#: templates/membership/membership_detail.html:52
+#: .\membership\templates\membership\membership_detail.html:50
 msgid "Member Since"
 msgstr "Mitglied seit"
 
-#: templates/membership/membership_detail.html:53
+#: .\membership\templates\membership\membership_detail.html:51
 msgid "Last Login"
 msgstr "Letzte Anmeldung"
 
-#: templates/membership/membership_detail.html:64
+#: .\membership\templates\membership\membership_detail.html:54
 msgid "Edit Profile"
 msgstr "Profil bearbeiten"
 
-#: templates/membership/membership_detail.html:65
+#: .\membership\templates\membership\membership_detail.html:55
-#: templates/registration/password_change_form.html:23
+#: .\membership\templates\registration\password_change_form.html:23
 msgid "Change Password"
 msgstr "Passwort ändern"
 
-#: templates/membership/membership_detail.html:67
+#: .\membership\templates\membership\membership_form.html:4
-#: templates/membership/membership_detail.html:69
+#: .\membership\templates\membership\membership_form.html:6
-#: templates/membership/membership_detail.html:71
+#: .\membership\templates\membership\membership_form.html:11
-#, python-format
-msgid "Associate with %(name)s"
-msgstr "Verbinde mit %(name)s"
-
-#: templates/membership/membership_form.html:4
-#: templates/membership/membership_form.html:6
-#: templates/membership/membership_form.html:11
 msgid "Edit Userprofile"
 msgstr "Profil bearbeiten"
 
-#: templates/membership/membership_form.html:15
+#: .\membership\templates\membership\membership_form.html:15
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: templates/membership/membership_form.html:16
+#: .\membership\templates\membership\membership_form.html:16
 msgid "Save"
 msgstr "Speichern"
 
-#: templates/membership/register_form.html:4
+#: .\membership\templates\membership\register_form.html:4
 msgid "Registration"
 msgstr "Registrieren"
 
-#: templates/membership/register_form.html:10
+#: .\membership\templates\membership\register_form.html:10
 msgid "Login crendentials"
 msgstr "Anmeldedaten"
 
-#: templates/membership/register_form.html:16
+#: .\membership\templates\membership\register_form.html:16
 msgid "Club membership"
 msgstr "Vereinsmitgliedschaft"
 
-#: templates/membership/register_form.html:27
+#: .\membership\templates\membership\register_form.html:27
 msgid "reset"
 msgstr "Zurücksetzen"
 
-#: templates/membership/register_form.html:29
+#: .\membership\templates\membership\register_form.html:29
 msgid "register"
 msgstr "Registrieren"
 
-#: templates/membership/register_successful.html:5
+#: .\membership\templates\membership\register_successful.html:5
-#: templates/membership/register_successful.html:7
+#: .\membership\templates\membership\register_successful.html:7
-#: templates/membership/register_successful.html:10
+#: .\membership\templates\membership\register_successful.html:10
 msgid "Activation sent"
 msgstr "Aktivierung wurde zugesendet"
 
-#: templates/registration/logged_out.html:16
+#: .\membership\templates\registration\login.html:17
-#: templates/registration/login.html:16
+msgid "login"
-#| msgid ""
+msgstr "Anmelden"
-#| "Your username and password didn't match. Please try\n"
+
-#| "      again."
+#: .\membership\templates\registration\login.html:19
 msgid "Your username and password didn't match. Please try again."
 msgstr "Anmeldung fehlgeschlagen, bitte Benutzername und Passwort überprüfen."
 
-#: templates/registration/logged_out.html:19
+#: .\membership\templates\registration\login.html:22
-#: templates/registration/login.html:19
 msgid "Forgot your Password?"
 msgstr "Passwort vergessen?"
 
-#: templates/registration/logged_out.html:23
+#: .\membership\templates\registration\login.html:26
-#: templates/registration/login.html:23
+#: .\membership\templates\registration\password_reset_complete.html:13
-#: templates/registration/password_reset_complete.html:13
 msgid "Login"
 msgstr "Anmelden"
 
-#: templates/registration/logged_out.html:29
+#: .\membership\templates\registration\password_change_done.html:4
-#: templates/registration/login.html:29
+#: .\membership\templates\registration\password_change_done.html:7
-msgid "or"
-msgstr "oder"
-
-#: templates/registration/logged_out.html:33
-#: templates/registration/login.html:33
-msgid "Login with Facebook"
-msgstr "Über Facebook anmelden"
-
-#: templates/registration/logged_out.html:35
-#: templates/registration/login.html:35
-msgid "Login with Twitter"
-msgstr "Über Twitter anmelden"
-
-#: templates/registration/logged_out.html:37
-#: templates/registration/login.html:37
-msgid "Login with Google"
-msgstr "Über Google Anmelden"
-
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_done.html:7
 msgid "Password change successful"
 msgstr "Benutzerprofil erfolgreich geändert."
 
-#: templates/registration/password_change_done.html:8
+#: .\membership\templates\registration\password_change_done.html:8
 msgid "Your password was changed."
 msgstr "Passwort geändet"
 
-#: templates/registration/password_change_form.html:4
+#: .\membership\templates\registration\password_change_form.html:4
-#: templates/registration/password_change_form.html:9
+#: .\membership\templates\registration\password_change_form.html:9
-#: templates/registration/password_change_form.html:16
+#: .\membership\templates\registration\password_change_form.html:16
 msgid "Password change"
 msgstr "Passwort wechseln"
 
-#: templates/registration/password_change_form.html:10
+#: .\membership\templates\registration\password_change_form.html:10
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new"
 " password twice so we can verify you typed it in correctly."
@@ -470,23 +468,23 @@ msgstr ""
 "Zur Sicherheit bitte altes Passwort einmal  und das gewünschte neue Passwort"
 " zweimal angeben, so können Tippfehler abgefangen werden."
 
-#: templates/registration/password_reset_complete.html:4
+#: .\membership\templates\registration\password_reset_complete.html:4
-#: templates/registration/password_reset_complete.html:6
+#: .\membership\templates\registration\password_reset_complete.html:6
-#: templates/registration/password_reset_complete.html:9
+#: .\membership\templates\registration\password_reset_complete.html:9
 msgid "Password reset complete"
 msgstr "Das Rücksetzen des Passwortes ist abgeschlossen."
 
-#: templates/registration/password_reset_complete.html:10
+#: .\membership\templates\registration\password_reset_complete.html:10
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "Das Passwort wurde gesetzt, Du kannst dich nun damit anmelden."
 
-#: templates/registration/password_reset_confirm.html:4
+#: .\membership\templates\registration\password_reset_confirm.html:4
-#: templates/registration/password_reset_confirm.html:6
+#: .\membership\templates\registration\password_reset_confirm.html:6
-#: templates/registration/password_reset_confirm.html:15
+#: .\membership\templates\registration\password_reset_confirm.html:15
 msgid "Enter new password"
 msgstr "Neues Passwort eingeben"
 
-#: templates/registration/password_reset_confirm.html:12
+#: .\membership\templates\registration\password_reset_confirm.html:12
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -494,15 +492,15 @@ msgstr ""
 "Bitte das Passwort zweimal eingeben, um sicher zu stellen das es korrekt "
 "eingetippt wurde."
 
-#: templates/registration/password_reset_confirm.html:18
+#: .\membership\templates\registration\password_reset_confirm.html:18
 msgid "Change my password"
 msgstr "Passwort ändern"
 
-#: templates/registration/password_reset_confirm.html:26
+#: .\membership\templates\registration\password_reset_confirm.html:26
 msgid "Password reset unsuccessful"
 msgstr "Passwort rücksetzen fehlgeschlagen"
 
-#: templates/registration/password_reset_confirm.html:27
+#: .\membership\templates\registration\password_reset_confirm.html:27
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -510,22 +508,22 @@ msgstr ""
 "Der Link für die Rücksetzung des Passwortes war ungültig, vermutlich wurde "
 "er schon einmal benutzt. Bitte eine neue Rücksetzung beantragen."
 
-#: templates/registration/password_reset_done.html:4
+#: .\membership\templates\registration\password_reset_done.html:4
-#: templates/registration/password_reset_done.html:6
+#: .\membership\templates\registration\password_reset_done.html:6
-#: templates/registration/password_reset_done.html:12
+#: .\membership\templates\registration\password_reset_done.html:12
 msgid "Password reset successful"
 msgstr "Passwort erfolgreich zurückgesetzt."
 
-#: templates/registration/password_reset_form.html:4
+#: .\membership\templates\registration\password_reset_form.html:4
-#: templates/registration/password_reset_form.html:6
+#: .\membership\templates\registration\password_reset_form.html:6
 msgid "Password reset"
 msgstr "Passwort zurücksetzen"
 
-#: templates/registration/password_reset_form.html:21
+#: .\membership\templates\registration\password_reset_form.html:21
 msgid "Transmit"
 msgstr "Übermitteln"
 
-#: views.py:61
+#: .\membership\views.py:61
 msgid ""
 "Activation successful.         You can now login anytime with you username "
 "and password."
@@ -533,14 +531,29 @@ msgstr ""
 "Die Aktivierung war erfolgreich. Du kannst dich ab jetzt jederzeit mit "
 "deinem Benutzernamen und Passwort anmelden."
 
-#: views.py:88
+#: .\membership\views.py:88
 msgid "User Profile changed successfully"
 msgstr "Benutzerprofil erfolgreich geändert."
 
-#: views.py:112
+#: .\membership\views.py:112
 msgid "No Membership found matching the query"
 msgstr "Kein Mitglied gefunden welche der Anfrage entspricht"
 
+#~ msgid "Associate with %(name)s"
+#~ msgstr "Verbinde mit %(name)s"
+
+#~ msgid "or"
+#~ msgstr "oder"
+
+#~ msgid "Login with Facebook"
+#~ msgstr "Über Facebook anmelden"
+
+#~ msgid "Login with Twitter"
+#~ msgstr "Über Twitter anmelden"
+
+#~ msgid "Login with Google"
+#~ msgstr "Über Google Anmelden"
+
 #~ msgid ""
 #~ "After you've provided your account data, you'll receive\n"
 #~ "      an email asking you to verify your email address. You have to click on the\n"
@@ -550,9 +563,6 @@ msgstr "Kein Mitglied gefunden welche der Anfrage entspricht"
 #~ "Nach dem du deine Daten eingegeben hast, wirst du eine E-Mail zur Bestätigung bekommen.\n"
 #~ "Bitte klicke auf den Link in dieser E-Mail zur Verifizierung, erst dann ist die Anmeldung möglich."
 
-#~ msgid "login"
-#~ msgstr "Anmelden"
-
 #~ msgid "Have you already registered?"
 #~ msgstr "Bereits registriert?"
 

src/membership/templates/membership/register_form.html

@@ -8,7 +8,7 @@
   {% csrf_token %}
   <fieldset class="grid_7">
     <legend>{% trans "Login crendentials"%}</legend>
-    {% get_fieldset "username, email, password1, password2, recaptcha" from form as form1 %}
+    {% get_fieldset "username, email, password1, password2, privacy_policy, recaptcha" from form as form1 %}
     {% with form1 as form %}{% include "form.html" %}{% endwith %}
   </fieldset>