From 3b162fc59c6fcc53f81b9aaf7804cd209addac9d Mon Sep 17 00:00:00 2001 From: Xeniac Date: Mon, 30 Apr 2018 10:16:04 +0200 Subject: [PATCH] All personal data can only seen by yourself. --- .../locale/de/LC_MESSAGES/django.mo | Bin 9885 -> 10104 bytes .../locale/de/LC_MESSAGES/django.po | 322 +++++++++--------- .../membership/membership_detail.html | 129 ++++--- 3 files changed, 216 insertions(+), 235 deletions(-) diff --git a/src/membership/locale/de/LC_MESSAGES/django.mo b/src/membership/locale/de/LC_MESSAGES/django.mo index 2db7ac48382b844f64e8add7f4f8cba4cd8a53b6..fa1d36d4c70d2696fbbaf4624fa4613eadf9cd01 100644 GIT binary patch delta 2067 zcmYMze@xVM9LMp`1*m}h5WI>2{ZeqpA_x*{Q3(!{tU!&-1{?G}?<-y%-(%mqqp?P} zRw>O1D;9H2m-?UPKSjIsN3k}|>W`XkjdE@-ZMpRa)*n`8TlIW(-xUKMpU>yM-}mSJ zd4Jw_r0+(5=2Aue+lHTU{%ZI;oTnM%mH%59Fs7FI5=-G##@vd3VHpMsjd>OuP_Mj< zKjS{U4JV3t2WPMZv$z`1An#|)c?K0MT*i95jtW#&Yz#3>9hPDf>cvjv5!36>pTctH zBUpgrsCX0p{0&^ed=|IiJoe*N46?uJASz??1nR+En2*D#fV=(m7^*_!cn}YwDp1X_ zZpS86BAbzq%uZCI5!7>I{(K4*cN#0%-^?&rgU3;se~3Eq=cq)MP!+j|3j6~q@Gq#u z|HKfk7+>cv`+KFGI zDpkmFX#-P^Z&r! z43z0j-(ni!9_BTu(r!h)Fo0^RVbqJRzy1=c#QS^?p?c#as@dN6=U<`@dJcQ>Le7k- zBYl-7hH9cI)P@I8cQ%g-_zvo1$B=586L=ICQCBolO9P^diZ_jlcNkUblc)n^Q3pPY ztMvW5XWkN_G_c@dJN75XvRkjXL2jR00uHz*)@4LwGM9 z@z=jX9c&48#moM@Ae^gAO}H_4S9i0Z%?Eyc5?(SzN(`NtJL)8zy##pC@uH5~vhYpa RRDNMDqs?||?#a-Oe*i_W^a%g} delta 1862 zcmYMzZD`G57{~EzIm|XQV~6c{*uk7L3_E8|G|VzFVmmcYO;e^s%aq6D#b2n&hH~cN z&DaYMMV;uBho~7LX*JKG@MbM9WL9J``Tp!*R%f64zR&qz_jO3AB4 z;RWP*$F4IN$wE8k;Y(DYJ|u=ErI`)KG}MDWZ;@3jD%sOyhV;BoA4#2rAJaOxp0SizkD?*B4^RN}8sH^#g zYF-;Z5YUHe!kMU2&qp1g9ChM#sD!qn65WCS-v6Tv)P$|52X3M&@felBGgRQWsExZ( z0e|3ZOr}%+ZHTH&IjV`PQE?Ao2+v?XKEXWf#mRdA$M7<$#Pd)amSZ(Wu>r4QDHiz$ zDzgjq`~9fO9dYL|RHCh@1H@64yoHL}hDz))DzPu?UUG5jNiKfhU zqE2=cmB1;~-Q7nIKE+ws>8|VD)N?7QyY;*Cxu~nDL?yf)RiQ1YczXi;SH?~t;Y$vt zCJts^8Wf9o8`DEGLLq-RTpTH!UKomXc*mx)68488#o=(G*Sl(1;^L%zo>)O}#a~2k Bwo(89 diff --git a/src/membership/locale/de/LC_MESSAGES/django.po b/src/membership/locale/de/LC_MESSAGES/django.po index de7d6c6..3d408f6 100644 --- a/src/membership/locale/de/LC_MESSAGES/django.po +++ b/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-01-11 22:50+0100\n" -"PO-Revision-Date: 2018-01-12 15:22+0105\n" +"POT-Creation-Date: 2018-04-30 10:10+0200\n" +"PO-Revision-Date: 2018-04-30 10:14+0105\n" "Last-Translator: b'Christian Berg '\n" "Language-Team: Kasu \n" "Language: de\n" @@ -19,165 +19,163 @@ msgstr "" "X-Generator: Poedit 1.8.9\n" "X-Translated-Using: django-rosetta 0.7.14\n" -#: src/membership/__init__.py:11 +#: __init__.py:11 msgid "Male" msgstr "Männlich" -#: src/membership/__init__.py:12 +#: __init__.py:12 msgid "Female" msgstr "Weiblich" -#: src/membership/admin.py:22 +#: admin.py:22 msgid "Activate selected User" msgstr "Ausgewählte Benutzer freischalten" -#: src/membership/admin.py:38 +#: admin.py:38 msgid "Cleanup selected Activation Requests" msgstr "Ausgewählte Aktivierungsanfragen bereinigen" -#: src/membership/admin.py:47 +#: admin.py:47 msgid "Group" msgstr "Gruppe" -#: src/membership/admin.py:48 +#: admin.py:48 msgid "Groups" msgstr "Gruppen" -#: src/membership/admin.py:72 src/membership/models.py:163 -#: src/membership/models.py:216 -#: src/membership/templates/membership/register_form.html:32 +#: admin.py:72 models.py:163 models.py:216 +#: templates/membership/register_form.html:32 msgid "Membership" msgstr "Mitgliedschaft" -#: src/membership/admin.py:77 +#: admin.py:77 msgid "Permissions" msgstr "Berechtigung" -#: src/membership/admin.py:79 +#: admin.py:79 msgid "Important dates" msgstr "Wichtige Daten" -#: src/membership/forms.py:23 +#: forms.py:23 templates/membership/membership_detail.html:46 msgid "birthday" msgstr "Geburtstag" -#: src/membership/forms.py:25 +#: forms.py:25 msgid "Input format: yyyy-mm-dd" msgstr "Eingabeformat: tt.mm.jjjj" -#: src/membership/forms.py:27 +#: forms.py:27 templates/membership/membership_detail.html:49 msgid "Email" msgstr "E-Mail" -#: src/membership/forms.py:42 src/membership/forms.py:50 -#: src/membership/forms.py:58 +#: forms.py:42 forms.py:50 forms.py:58 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." -#: src/membership/forms.py:65 +#: forms.py:65 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." -#: src/membership/forms.py:78 +#: forms.py:78 msgid "password" msgstr "Passwort" -#: src/membership/forms.py:80 +#: forms.py:80 msgid "password (again)" msgstr "Passwort (wiederholen)" -#: src/membership/forms.py:102 +#: forms.py:102 msgid "This username is already taken. Please choose another." msgstr "" "Diesen Benutzername ist schon vergeben. Bitte einen anderen auswählen." -#: src/membership/forms.py:109 +#: forms.py:109 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." -#: src/membership/forms.py:119 +#: forms.py:119 msgid "The two password fields didn't match." msgstr "Die beiden Passwörter passen nicht." -#: src/membership/models.py:84 +#: models.py:84 msgid "user" msgstr "Benutzer" -#: src/membership/models.py:86 +#: models.py:86 msgid "activation key" msgstr "Aktivierungsschlüssel" -#: src/membership/models.py:90 +#: models.py:90 msgid "pending activation" msgstr "Ausstehende Aktivierung" -#: src/membership/models.py:91 +#: models.py:91 msgid "pending activations" msgstr "Wartende Aktivierungen" -#: src/membership/models.py:94 +#: models.py:94 #, python-format msgid "user registration for %s" msgstr "Benutzerregistrierung für %s" -#: src/membership/models.py:149 +#: models.py:149 msgid "Gender" msgstr "Geschlecht" -#: src/membership/models.py:165 +#: 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." -#: src/membership/models.py:169 +#: models.py:169 msgid "Birthday Date" msgstr "Geburtstag" -#: src/membership/models.py:173 +#: models.py:173 templates/membership/membership_detail.html:50 msgid "Telephone" msgstr "Telefon" -#: src/membership/models.py:179 +#: models.py:179 templates/membership/membership_detail.html:47 msgid "Address" msgstr "Adresse" -#: src/membership/models.py:185 +#: models.py:185 msgid "Postcode" msgstr "Postleitzahl" -#: src/membership/models.py:190 +#: models.py:190 msgid "Town/City" msgstr "Ort" -#: src/membership/models.py:198 +#: models.py:198 msgid "Paid until" msgstr "Bezahlt bis" -#: src/membership/models.py:204 +#: models.py:204 msgid "Confirmed" msgstr "Bestätigt" -#: src/membership/models.py:206 +#: models.py:206 msgid "This person has paid the membership fee." msgstr "Diese Person hat ihre Mitgliedschaft bezahlt" -#: src/membership/models.py:217 +#: models.py:217 msgid "Memberships" msgstr "Mitgliedschaften" -#: src/membership/templates/membership/email/activation_email.txt:2 +#: templates/membership/email/activation_email.txt:2 #, python-format msgid "Welcome %(user)s," msgstr "Herzlich willkommen %(user)s," -#: src/membership/templates/membership/email/activation_email.txt:4 +#: templates/membership/email/activation_email.txt:4 #, python-format msgid "" "We received an account request on %(site.domain)s for your email address.\n" @@ -186,7 +184,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:" -#: src/membership/templates/membership/email/activation_email.txt:9 +#: 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" @@ -195,7 +193,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." -#: src/membership/templates/membership/email/activation_email.txt:12 +#: templates/membership/email/activation_email.txt:12 #, python-format msgid "" "Best Regards,\n" @@ -204,170 +202,185 @@ msgstr "" "mit den besten Wünschen\n" "Das Team von %(site.domain)s" -#: src/membership/templates/membership/email/password_reset_email.html:2 +#: 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. " -#: src/membership/templates/membership/email/password_reset_email.html:3 +#: 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" -#: src/membership/templates/membership/email/password_reset_email.html:5 +#: 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:" -#: src/membership/templates/membership/email/password_reset_email.html:9 +#: 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:" -#: src/membership/templates/membership/email/password_reset_email.html:11 +#: templates/membership/email/password_reset_email.html:11 msgid "Thanks for using our site!" msgstr "Danke das du unsere Seite verwendest!" -#: src/membership/templates/membership/email/password_reset_email.html:13 +#: templates/membership/email/password_reset_email.html:13 #, python-format msgid "The %(site_name)s team" msgstr "Das %(site_name)s Team" -#: src/membership/templates/membership/email/password_reset_subject.txt:2 +#: 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" -#: src/membership/templates/membership/hanchan_table.html:5 +#: templates/membership/hanchan_table.html:5 msgid "Start" msgstr "Beginn" -#: src/membership/templates/membership/hanchan_table.html:6 +#: templates/membership/hanchan_table.html:6 msgid "Event" msgstr "Termin" -#: src/membership/templates/membership/hanchan_table.html:7 +#: templates/membership/hanchan_table.html:7 msgid "Players" msgstr "Spieler" -#: src/membership/templates/membership/hanchan_table.html:8 +#: templates/membership/hanchan_table.html:8 msgid "Kyu Points" msgstr "Kyū Punkte" -#: src/membership/templates/membership/hanchan_table.html:9 +#: templates/membership/hanchan_table.html:9 msgid "Dan Points" msgstr "Dan Punkte" -#: src/membership/templates/membership/hanchan_table.html:10 +#: templates/membership/hanchan_table.html:10 msgid "Bonus Points" msgstr "Bonus Punkte" -#: src/membership/templates/membership/hanchan_table.html:11 +#: templates/membership/hanchan_table.html:11 msgid "Comment" msgstr "Anmerkung" -#: src/membership/templates/membership/hanchan_table.html:26 +#: templates/membership/hanchan_table.html:26 msgid "This Hanchan does not validate" msgstr "Diese Hanchan ist ungültig" -#: src/membership/templates/membership/membership_detail.html:6 +#: templates/membership/membership_detail.html:5 msgid "profile for" msgstr "Profil für" -#: src/membership/templates/membership/membership_detail.html:10 +#: templates/membership/membership_detail.html:9 msgid "Ladder Hanchans" msgstr "Ladder Hanchans" -#: src/membership/templates/membership/membership_detail.html:11 +#: templates/membership/membership_detail.html:10 msgid "Kyu Hanchans" msgstr "Kyū Hanchans" -#: src/membership/templates/membership/membership_detail.html:12 +#: templates/membership/membership_detail.html:11 msgid "Dan Hanchans" msgstr "Dan Hanchans" -#: src/membership/templates/membership/membership_detail.html:13 +#: templates/membership/membership_detail.html:12 msgid "Invalid Hanchans" msgstr "Ungültige Hanchans" -#: src/membership/templates/membership/membership_detail.html:14 +#: templates/membership/membership_detail.html:13 msgid "Mai-Star Games" msgstr "Mai-Star Spiele" -#: src/membership/templates/membership/membership_detail.html:20 +#: templates/membership/membership_detail.html:17 msgid "Profile Image" msgstr "Profilbild" -#: src/membership/templates/membership/membership_detail.html:28 -msgid "Member Since" -msgstr "Mitglied seit" - -#: src/membership/templates/membership/membership_detail.html:29 -msgid "Last Login" -msgstr "Letzte Anmeldung" - -#: src/membership/templates/membership/membership_detail.html:39 -#: src/membership/templates/membership/membership_detail.html:43 +#: templates/membership/membership_detail.html:26 +#: templates/membership/membership_detail.html:29 msgid "Points" msgstr "Punkte" -#: src/membership/templates/membership/membership_detail.html:40 +#: templates/membership/membership_detail.html:26 msgid "Maximum" msgstr "Maximum" -#: src/membership/templates/membership/membership_detail.html:45 +#: templates/membership/membership_detail.html:32 msgid "Games Total" msgstr "Spiele gesamt" -#: src/membership/templates/membership/membership_detail.html:46 -#: src/membership/templates/membership/membership_detail.html:48 +#: templates/membership/membership_detail.html:32 +#: templates/membership/membership_detail.html:35 msgid "Won" msgstr "Gewonnen" -#: src/membership/templates/membership/membership_detail.html:46 -#: src/membership/templates/membership/membership_detail.html:48 +#: templates/membership/membership_detail.html:32 +#: templates/membership/membership_detail.html:35 msgid "Good" msgstr "Gut" -#: src/membership/templates/membership/membership_detail.html:48 +#: templates/membership/membership_detail.html:35 msgid "Current Season" msgstr "Aktuelle Saison" -#: src/membership/templates/membership/membership_detail.html:58 +#: templates/membership/membership_detail.html:42 +msgid "private data" +msgstr "Private Daten" + +#: 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 +#: templates/membership/register_form.html:20 +msgid "name" +msgstr "Name" + +#: templates/membership/membership_detail.html:52 +msgid "Member Since" +msgstr "Mitglied seit" + +#: templates/membership/membership_detail.html:53 +msgid "Last Login" +msgstr "Letzte Anmeldung" + +#: templates/membership/membership_detail.html:64 msgid "Edit Profile" msgstr "Profil bearbeiten" -#: src/membership/templates/membership/membership_detail.html:62 -#: src/membership/templates/registration/password_change_form.html:23 +#: templates/membership/membership_detail.html:65 +#: templates/registration/password_change_form.html:23 msgid "Change Password" msgstr "Passwort ändern" -#: src/membership/templates/membership/membership_detail.html:66 -#: src/membership/templates/membership/membership_detail.html:70 -#: src/membership/templates/membership/membership_detail.html:74 +#: templates/membership/membership_detail.html:67 +#: templates/membership/membership_detail.html:69 +#: templates/membership/membership_detail.html:71 #, python-format msgid "Associate with %(name)s" msgstr "Verbinde mit %(name)s" -#: src/membership/templates/membership/membership_form.html:4 -#: src/membership/templates/membership/membership_form.html:6 -#: src/membership/templates/membership/membership_form.html:11 +#: templates/membership/membership_form.html:4 +#: templates/membership/membership_form.html:6 +#: templates/membership/membership_form.html:11 msgid "Edit Userprofile" msgstr "Profil bearbeiten" -#: src/membership/templates/membership/membership_form.html:15 +#: templates/membership/membership_form.html:15 msgid "Reset" msgstr "Zurücksetzen" -#: src/membership/templates/membership/membership_form.html:16 +#: templates/membership/membership_form.html:16 msgid "Save" msgstr "Speichern" -#: src/membership/templates/membership/register_form.html:4 -#: src/membership/templates/membership/register_form.html:7 +#: templates/membership/register_form.html:4 +#: templates/membership/register_form.html:7 msgid "Registration" msgstr "Registrieren" -#: src/membership/templates/membership/register_form.html:9 +#: templates/membership/register_form.html:9 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" @@ -377,51 +390,37 @@ msgstr "" "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." -#: src/membership/templates/membership/register_form.html:20 -msgid "name" -msgstr "Name" - -#: src/membership/templates/membership/register_form.html:26 -#: src/membership/templates/registration/login.html:41 +#: templates/membership/register_form.html:26 +#: templates/registration/login.html:41 msgid "login" msgstr "Anmelden" -#: src/membership/templates/membership/register_form.html:39 +#: templates/membership/register_form.html:39 msgid "reset" msgstr "Zurücksetzen" -#: src/membership/templates/membership/register_form.html:41 -#: src/membership/templates/registration/login.html:35 +#: templates/membership/register_form.html:41 +#: templates/registration/login.html:35 msgid "register" msgstr "Registrieren" -#: src/membership/templates/membership/register_successful.html:5 -#: src/membership/templates/membership/register_successful.html:7 -#: src/membership/templates/membership/register_successful.html:10 +#: templates/membership/register_successful.html:5 +#: templates/membership/register_successful.html:7 +#: templates/membership/register_successful.html:10 msgid "Activation sent" msgstr "Aktivierung wurde zugesendet" -#: src/membership/templates/registration/login.html:4 -#: src/membership/templates/registration/login.html:11 -#: src/membership/templates/registration/login.html:53 -#: src/membership/templates/registration/password_reset_complete.html:13 +#: templates/registration/login.html:4 templates/registration/login.html:11 +#: templates/registration/login.html:53 +#: templates/registration/password_reset_complete.html:13 msgid "Login" msgstr "Anmelden" -#: src/membership/templates/registration/login.html:17 +#: templates/registration/login.html:17 msgid "Have you already registered?" msgstr "Bereits registriert?" -#: src/membership/templates/registration/login.html:18 -#| msgid "" -#| "\n" -#| "

As a registered member you can:

\n" -#| "
    \n" -#| "
  • leave comments on this page.
    • \n" -#| "
  • subscribe to our Newsletter
    • \n" -#| "
  • apply to a membership to our club
    • \n" -#| "
  • club-members have access to our ranking-system
    • \n" -#| "
\n" +#: templates/registration/login.html:18 msgid "" "\n" "

As a registered member you can:

\n" @@ -442,12 +441,7 @@ msgstr "" "
  • Vereinsmitglieder haben auch vollen Zugang zu unserem Ranking System
    • \n" "" -#: src/membership/templates/registration/login.html:27 -#| msgid "" -#| "\n" -#| "

    You can register here with your Google, or Facebook account.\n" -#| "If you don't own such an account, or do not want to use it for authentication,\n" -#| "you can fill out our registration form.

    \n" +#: templates/registration/login.html:27 msgid "" "\n" "

    You can register here with your Google, or Facebook account.\n" @@ -461,8 +455,7 @@ msgstr "" "Wenn du so etwas nicht besitzt, oder nicht verwenden möchtest, \n" "kannst du auch das Registrierungsformular ausfüllen.

    " -#: src/membership/templates/registration/login.html:45 -#| msgid "Your username and password didn't match. Please try again." +#: templates/registration/login.html:45 msgid "" "Your username and password didn't match. Please try\n" " again." @@ -470,42 +463,42 @@ msgstr "" "Benutzername und Passwort stimmen nicht überein. Bitte noch einmal " "versuchen." -#: src/membership/templates/registration/login.html:50 +#: templates/registration/login.html:50 msgid "Forgot your Password?" msgstr "Passwort vergessen?" -#: src/membership/templates/registration/login.html:60 +#: templates/registration/login.html:60 msgid "or login with an existing Account" msgstr "oder über einen existierenden Account anmelden" -#: src/membership/templates/registration/login.html:63 +#: templates/registration/login.html:63 msgid "Login with Facebook" msgstr "Über Facebook anmelden" -#: src/membership/templates/registration/login.html:66 +#: templates/registration/login.html:66 msgid "Login with Twitter" msgstr "Über Twitter anmelden" -#: src/membership/templates/registration/login.html:69 +#: templates/registration/login.html:69 msgid "Login with Google" msgstr "Über Google Anmelden" -#: src/membership/templates/registration/password_change_done.html:4 -#: src/membership/templates/registration/password_change_done.html:7 +#: templates/registration/password_change_done.html:4 +#: templates/registration/password_change_done.html:7 msgid "Password change successful" msgstr "Benutzerprofil erfolgreich geändert." -#: src/membership/templates/registration/password_change_done.html:8 +#: templates/registration/password_change_done.html:8 msgid "Your password was changed." msgstr "Passwort geändet" -#: src/membership/templates/registration/password_change_form.html:4 -#: src/membership/templates/registration/password_change_form.html:9 -#: src/membership/templates/registration/password_change_form.html:16 +#: templates/registration/password_change_form.html:4 +#: templates/registration/password_change_form.html:9 +#: templates/registration/password_change_form.html:16 msgid "Password change" msgstr "Passwort wechseln" -#: src/membership/templates/registration/password_change_form.html:10 +#: 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." @@ -513,23 +506,23 @@ msgstr "" "Zur Sicherheit bitte altes Passwort einmal und das gewünschte neue Passwort" " zweimal angeben, so können Tippfehler abgefangen werden." -#: src/membership/templates/registration/password_reset_complete.html:4 -#: src/membership/templates/registration/password_reset_complete.html:6 -#: src/membership/templates/registration/password_reset_complete.html:9 +#: templates/registration/password_reset_complete.html:4 +#: templates/registration/password_reset_complete.html:6 +#: templates/registration/password_reset_complete.html:9 msgid "Password reset complete" msgstr "Das Rücksetzen des Passwortes ist abgeschlossen." -#: src/membership/templates/registration/password_reset_complete.html:10 +#: 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." -#: src/membership/templates/registration/password_reset_confirm.html:4 -#: src/membership/templates/registration/password_reset_confirm.html:6 -#: src/membership/templates/registration/password_reset_confirm.html:15 +#: templates/registration/password_reset_confirm.html:4 +#: templates/registration/password_reset_confirm.html:6 +#: templates/registration/password_reset_confirm.html:15 msgid "Enter new password" msgstr "Neues Passwort eingeben" -#: src/membership/templates/registration/password_reset_confirm.html:12 +#: templates/registration/password_reset_confirm.html:12 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -537,15 +530,15 @@ msgstr "" "Bitte das Passwort zweimal eingeben, um sicher zu stellen das es korrekt " "eingetippt wurde." -#: src/membership/templates/registration/password_reset_confirm.html:18 +#: templates/registration/password_reset_confirm.html:18 msgid "Change my password" msgstr "Passwort ändern" -#: src/membership/templates/registration/password_reset_confirm.html:26 +#: templates/registration/password_reset_confirm.html:26 msgid "Password reset unsuccessful" msgstr "Passwort rücksetzen fehlgeschlagen" -#: src/membership/templates/registration/password_reset_confirm.html:27 +#: 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." @@ -553,22 +546,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." -#: src/membership/templates/registration/password_reset_done.html:4 -#: src/membership/templates/registration/password_reset_done.html:6 -#: src/membership/templates/registration/password_reset_done.html:12 +#: templates/registration/password_reset_done.html:4 +#: templates/registration/password_reset_done.html:6 +#: templates/registration/password_reset_done.html:12 msgid "Password reset successful" msgstr "Passwort erfolgreich zurückgesetzt." -#: src/membership/templates/registration/password_reset_form.html:4 -#: src/membership/templates/registration/password_reset_form.html:6 +#: templates/registration/password_reset_form.html:4 +#: templates/registration/password_reset_form.html:6 msgid "Password reset" msgstr "Passwort zurücksetzen" -#: src/membership/templates/registration/password_reset_form.html:21 +#: templates/registration/password_reset_form.html:21 msgid "Transmit" msgstr "Übermitteln" -#: src/membership/views.py:61 +#: views.py:61 msgid "" "Activation successful. You can now login anytime with you username " "and password." @@ -576,12 +569,11 @@ msgstr "" "Die Aktivierung war erfolgreich. Du kannst dich ab jetzt jederzeit mit " "deinem Benutzernamen und Passwort anmelden." -#: src/membership/views.py:88 +#: views.py:88 msgid "User Profile changed successfully" msgstr "Benutzerprofil erfolgreich geändert." -#: src/membership/views.py:112 -#| msgid "No %(verbose_name)s found matching the query" +#: views.py:112 msgid "No Membership found matching the query" msgstr "Kein Mitglied gefunden welche der Anfrage entspricht" diff --git a/src/membership/templates/membership/membership_detail.html b/src/membership/templates/membership/membership_detail.html index d1af67c..009de68 100644 --- a/src/membership/templates/membership/membership_detail.html +++ b/src/membership/templates/membership/membership_detail.html @@ -1,5 +1,4 @@ -{% extends "base.html" %} -{% load i18n comments thumbnail %} +{% extends "base.html" %}{% load i18n comments thumbnail %} {% block title %}{{ membership.first_name }} {{membership.last_name}}{% endblock %} @@ -7,84 +6,74 @@ {% block navigation %} -{% endblock %} +
  • {% trans "Ladder Hanchans" %}
    • +
  • {% trans "Kyu Hanchans" %}
    • +
  • {% trans "Dan Hanchans" %}
    • +
  • {% trans "Invalid Hanchans" %}
    • +
  • {% trans "Mai-Star Games" %}
    • +{% endblock %} -{% block maincontent %} -{% if membership.avatar %} - {% trans 'Profile Image' %} -{% else %} -
    Noch kein Foto hoch geladen
    -{% endif %} +{% block maincontent %}{% if membership.avatar %} +{% trans 'Profile Image' %}{% else %} +
    Noch kein Foto hoch geladen
    {% endif %}
    -
      -
    • Name: {{membership.first_name}} {{membership.last_name}}
      • -
    • {% trans "Member Since" %}: {{membership.date_joined}}
      • -
    • {% trans "Last Login" %}: {{membership.last_login}}
      • - {% if website %} -
    • Homepage: {{website}}
      • - {% endif %} -
    - {% if kyu_dan_ranking %} -

    Mahjong

    -
      - {% if kyu_dan_ranking.dan %} -
    • - {{kyu_dan_ranking.dan}}. Dan: {{ kyu_dan_ranking.dan_points }} {% trans 'Points' %} - ({% trans 'Maximum' %}: {{ kyu_dan_ranking.max_dan_points }}) -
      • - {% elif kyu_dan_ranking.kyu%} -
    • {{kyu_dan_ranking.kyu}}. Kyu: {{ kyu_dan_ranking.kyu_points }} {% trans 'Points' %}
      • - {% endif %} -
    • {% trans 'Games Total' %}: {{ kyu_dan_ranking.hanchan_count }} Hanchans - - {{kyu_dan_ranking.won_hanchans }} {% trans 'Won' %} / {{ kyu_dan_ranking.good_hanchans }} {% trans 'Good' %} -
      • -
    • {% trans 'Current Season' %}: {{ ladder_ranking.hanchan_count }} Hanchans - {{ ladder_ranking.won_hanchans }} {% trans 'Won' %} / {{ ladder_ranking.good_hanchans }} {% trans 'Good' %} -
      • -
    + {% if kyu_dan_ranking %} +

    Mahjong

    +
      + {% if kyu_dan_ranking.dan %} +
    • + {{kyu_dan_ranking.dan}}. Dan: {{ kyu_dan_ranking.dan_points }} {% trans 'Points' %} ({% trans 'Maximum' %}: {{ kyu_dan_ranking.max_dan_points }}) +
      • + {% elif kyu_dan_ranking.kyu%} +
    • {{kyu_dan_ranking.kyu}}. Kyu: {{ kyu_dan_ranking.kyu_points }} {% trans 'Points' %}
      • {% endif %} +
    • + {% trans 'Games Total' %}: {{ kyu_dan_ranking.hanchan_count }} Hanchans - {{kyu_dan_ranking.won_hanchans }} {% trans 'Won' %} / {{ kyu_dan_ranking.good_hanchans }} {% trans 'Good' %} +
      • +
    • + {% trans 'Current Season' %}: {{ ladder_ranking.hanchan_count }} Hanchans - {{ ladder_ranking.won_hanchans }} {% trans 'Won' %} / {{ ladder_ranking.good_hanchans }} {% trans 'Good' %} +
      • +
    + {% endif %} + + {% if membership == user or perms.membership.change_membership%} + +

    {% trans 'private data' %}

    +

    {% blocktrans %}This data can only be seen by yourself and members of the board.{% endblocktrans %}

    +
      +
    • {% trans "name" %}: {{membership.first_name}} {{membership.last_name}}
      • +
    • {% trans "birthday" %}: {{membership.birthday}}
      • +
    • {% trans "Address" %}:
      {{ membership.street_name }}
      {{ membership.post_code }} {{ membership.city }}
      • + +
    • {% trans "Email" %}: {{membership.email}}
      • +
    • {% trans "Telephone" %}: {{membership.telephone}}
      • + +
    • {% trans "Member Since" %}: {{membership.date_joined}}
      • +
    • {% trans "Last Login" %}: {{membership.last_login}}
      • + {% if website %} +
    • Homepage: {{website}}
      • + {% endif %} +
    + {% endif %} +
    {% ifequal membership user %}
    - - - {% trans "Edit Profile" %} - - - - {% trans 'Change Password' %} - - - - {% blocktrans with 'Facebook' as name %}Associate with {{ name }}{% endblocktrans %} - - - - {% blocktrans with 'Twitter' as name %}Associate with {{ name }}{% endblocktrans %} - - - - {% blocktrans with 'Google' as name %}Associate with {{ name }}{% endblocktrans %} - + {% trans "Edit Profile" %} + {% trans 'Change Password' %} + + {% blocktrans with 'Facebook' as name %}Associate with {{ name }}{% endblocktrans %} + + {% blocktrans with 'Twitter' as name %}Associate with {{ name }}{% endblocktrans %} + + {% blocktrans with 'Google' as name %}Associate with {{ name }}{% endblocktrans %} -
    -{% endifequal %} +{% endifequal %} -{% block score_list %} {% endblock %} -{% endblock %} +{% block score_list %} {% endblock %}{% endblock %} -{% block comments %} -{% if membership %} - {% render_comment_list for membership %} - {% render_comment_form for membership %} -{% endif %} -{% endblock %} +{% block comments %}{% if membership %}{% render_comment_list for membership %}{% render_comment_form for membership %}{% endif %}{% endblock %} {% block buttonbar%}{%endblock%}