From e4309745438c544965ad41f9ea9e5728f1d00800 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Wed, 31 Oct 2012 09:04:38 +0100 Subject: [PATCH 1/4] Added .gitattributes for ignoring files with 'git archive' export. --- .gitattributes | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..956626053 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,4 @@ +.gitattributes export-ignore +.gitignore export-ignore +docs/ export-ignore +extras/ export-ignore From 60c01770b7657f7383b38ec298605b795384ac5d Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Wed, 31 Oct 2012 09:06:56 +0100 Subject: [PATCH 2/4] Fixed folder list for .gitattributes. --- .gitattributes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitattributes b/.gitattributes index 956626053..53cd07125 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,4 @@ .gitattributes export-ignore .gitignore export-ignore -docs/ export-ignore -extras/ export-ignore +/docs export-ignore +/extras export-ignore From 005cb2f15edcdfe0a1db7238f97a2e655d3c28eb Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Sat, 3 Nov 2012 08:59:34 +0100 Subject: [PATCH 3/4] Updated translations. --- .../assignment/templates/assignment/view.html | 4 +- openslides/locale/de/LC_MESSAGES/django.mo | Bin 34086 -> 35393 bytes openslides/locale/de/LC_MESSAGES/django.po | 308 ++++++++++++------ .../templates/participant/group_detail.html | 2 +- .../participant/personal_info_widget.html | 12 +- .../templates/participant/user_detail.html | 2 +- .../templates/participant/user_widget.html | 2 +- openslides/participant/views.py | 2 +- 8 files changed, 216 insertions(+), 116 deletions(-) diff --git a/openslides/assignment/templates/assignment/view.html b/openslides/assignment/templates/assignment/view.html index 2f46fa81f..0cf5ec548 100644 --- a/openslides/assignment/templates/assignment/view.html +++ b/openslides/assignment/templates/assignment/view.html @@ -101,7 +101,7 @@ {% endif %} {% empty %} -
  • {% trans "There are no elected candidates available." %}
    • +
  • {% trans "No elected candidates available." %}
    • {% endfor %} @@ -113,7 +113,7 @@ {{ person }} {% empty %} -
  • {% trans "There are no blocked candidates available." %}
    • +
  • {% trans "No blocked candidates available." %}
    • {% endfor %} {% endif %} diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo index bbb46fe8a1b02875082c37f8a7d55387d97ef17e..52ad807ebac44a66d0b4d7cbd654d930ac159766 100644 GIT binary patch delta 11341 zcmZwN33yG{-pBEs2#F9=OhGt^m?gwqK?O0EnrAX>$ssw3$*snpjqUtYgf^1nPT@Ut
  • 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 XjdpOiZGVNuJHiI%6?*-97Z>~=W)26g delta 10163 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 N>&$=Od3Ju@e*v+cxWE7a diff --git a/openslides/locale/de/LC_MESSAGES/django.po b/openslides/locale/de/LC_MESSAGES/django.po index 040a189d8..b5e53225d 100644 --- a/openslides/locale/de/LC_MESSAGES/django.po +++ b/openslides/locale/de/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: OpenSlides 1.x\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-10-30 22:38+0100\n" +"POT-Creation-Date: 2012-11-03 08:56+0100\n" "PO-Revision-Date: 2012-07-28 11:07+0200\n" "Last-Translator: Emanuel Schuetze \n" "Language-Team: support@openslides.de\n" @@ -43,6 +43,7 @@ msgstr "Text" #: agenda/models.py:44 agenda/templates/agenda/overview.html:65 #: agenda/templates/agenda/view.html:13 participant/models.py:53 #: participant/templates/participant/overview.html:72 +#: participant/templates/participant/user_detail.html:40 msgid "Comment" msgstr "Kommentar" @@ -221,9 +222,9 @@ msgstr "Zusammenfassung für diesen Eintrag projizieren" msgid "Do you want to save the changed order of agenda items?" msgstr "Möchten Sie die geänderte Reihenfolge der Einträge speichern?" -#: agenda/templates/agenda/overview.html:46 assignment/models.py:300 -#: assignment/views.py:576 assignment/templates/assignment/view.html:166 -#: assignment/templates/assignment/view.html:170 +#: agenda/templates/agenda/overview.html:46 assignment/models.py:302 +#: assignment/views.py:577 assignment/templates/assignment/view.html:184 +#: assignment/templates/assignment/view.html:188 #: assignment/templates/projector/Assignment.html:78 #: assignment/templates/projector/Assignment.html:82 motion/models.py:574 #: motion/views.py:804 motion/views.py:855 @@ -233,8 +234,8 @@ msgstr "Möchten Sie die geänderte Reihenfolge der Einträge speichern?" msgid "Yes" msgstr "Ja" -#: agenda/templates/agenda/overview.html:47 assignment/models.py:300 -#: assignment/views.py:577 assignment/templates/assignment/view.html:167 +#: agenda/templates/agenda/overview.html:47 assignment/models.py:302 +#: assignment/views.py:578 assignment/templates/assignment/view.html:185 #: assignment/templates/projector/Assignment.html:79 motion/models.py:574 #: motion/views.py:804 motion/views.py:856 #: motion/templates/motion/view.html:80 @@ -271,7 +272,7 @@ msgstr "Eintrag" #: agenda/templates/agenda/overview.html:68 #: assignment/templates/assignment/overview.html:28 #: motion/templates/motion/overview.html:43 -#: participant/templates/participant/group_overview.html:13 +#: participant/templates/participant/group_overview.html:14 #: participant/templates/participant/overview.html:74 msgid "Actions" msgstr "Aktionen" @@ -286,23 +287,29 @@ msgstr "Keine Einträge vorhanden." #: agenda/templates/agenda/widget.html:29 #: assignment/templates/assignment/widget.html:17 #: motion/templates/motion/widget.html:17 +#: participant/templates/participant/group_widget.html:17 +#: participant/templates/participant/user_widget.html:16 #: projector/templates/projector/custom_slide_widget.html:11 #: projector/templates/projector/custom_slide_widget.html:30 msgid "Preview" msgstr "Vorschau" #: agenda/templates/agenda/widget.html:23 -#: assignment/templates/assignment/view.html:130 +#: assignment/templates/assignment/view.html:148 #: assignment/templates/assignment/widget.html:11 #: motion/templates/motion/widget.html:11 +#: participant/templates/participant/group_widget.html:11 +#: participant/templates/participant/user_widget.html:10 #: projector/templates/projector/custom_slide_widget.html:24 msgid "Delete" msgstr "Löschen" #: agenda/templates/agenda/widget.html:26 -#: assignment/templates/assignment/view.html:129 +#: assignment/templates/assignment/view.html:147 #: assignment/templates/assignment/widget.html:14 #: motion/templates/motion/widget.html:14 +#: participant/templates/participant/group_widget.html:14 +#: participant/templates/participant/user_widget.html:13 #: projector/templates/projector/custom_slide_widget.html:27 msgid "Edit" msgstr "Bearbeiten" @@ -385,7 +392,7 @@ msgstr "Abgeschlossen" msgid "Name" msgstr "Name" -#: assignment/models.py:55 participant/models.py:114 +#: assignment/models.py:55 participant/models.py:117 msgid "Description" msgstr "Beschreibung" @@ -422,36 +429,36 @@ msgstr "%s möchte nicht kandidieren." msgid "%s is no candidate" msgstr "%s ist kein/e Kandidat/in" -#: assignment/models.py:253 +#: assignment/models.py:255 msgid "Can see assignment" msgstr "Darf Wahlen sehen" -#: assignment/models.py:255 +#: assignment/models.py:257 msgid "Can nominate another person" msgstr "Darf andere Personen für Wahlen vorschlagen" -#: assignment/models.py:256 +#: assignment/models.py:258 msgid "Can nominate themselves" msgstr "Darf selbst für Wahlen kandidieren" -#: assignment/models.py:257 +#: assignment/models.py:259 msgid "Can manage assignment" msgstr "Darf Wahlen verwalten" -#: assignment/models.py:301 motion/models.py:575 +#: assignment/models.py:303 motion/models.py:575 msgid "Abstain" msgstr "Enthaltung" -#: assignment/models.py:303 motion/templates/motion/poll_view.html:22 +#: assignment/models.py:305 motion/templates/motion/poll_view.html:22 msgid "Votes" msgstr "Stimmen" -#: assignment/models.py:320 +#: assignment/models.py:322 #, python-format msgid "Ballot %d" msgstr "Wahlgang %d" -#: assignment/models.py:329 assignment/views.py:340 assignment/views.py:663 +#: assignment/models.py:331 assignment/views.py:340 assignment/views.py:664 #: assignment/templates/assignment/base_assignment.html:14 #: assignment/templates/assignment/overview.html:6 #: assignment/templates/assignment/overview.html:9 @@ -472,7 +479,7 @@ msgid "Election was successfully modified." msgstr "Wahl wurde erfolgreich geändert." #: assignment/views.py:138 motion/views.py:257 motion/views.py:663 -#: participant/views.py:457 participant/views.py:480 utils/views.py:225 +#: participant/views.py:492 participant/views.py:515 utils/views.py:225 #: utils/views.py:243 utils/views.py:267 msgid "Please check the form for errors." msgstr "Bitte kontrollieren Sie das Formular nach Fehlern." @@ -541,6 +548,7 @@ msgid "not elected" msgstr "nicht gewählt" #: assignment/views.py:298 assignment/views.py:481 +#: assignment/templates/assignment/overview.html:35 msgid "elected" msgstr "gewählt" @@ -552,7 +560,7 @@ msgstr "Abstimmung wurde erfolgreich gelöscht." msgid "Assignment" msgstr "Wahl" -#: assignment/views.py:358 assignment/templates/assignment/overview.html:53 +#: assignment/views.py:358 assignment/templates/assignment/overview.html:58 #: assignment/templates/assignment/widget.html:23 msgid "No assignments available." msgstr "Keine Wahlen vorhanden." @@ -566,7 +574,7 @@ msgstr "Wahlen: %s" #: assignment/templates/assignment/overview.html:26 #: assignment/templates/assignment/poll_view.html:18 #: assignment/templates/assignment/view.html:36 -#: assignment/templates/assignment/view.html:118 +#: assignment/templates/assignment/view.html:136 #: assignment/templates/projector/Assignment.html:38 #: assignment/templates/projector/Assignment.html:56 msgid "Candidates" @@ -581,8 +589,8 @@ msgstr "Abstimmungsergebnis" #: assignment/templates/assignment/base_assignment.html:71 #: assignment/templates/assignment/poll_view.html:5 #: assignment/templates/assignment/poll_view.html:8 -#: assignment/templates/assignment/view.html:112 -#: assignment/templates/assignment/view.html:121 +#: assignment/templates/assignment/view.html:130 +#: assignment/templates/assignment/view.html:139 #: assignment/templates/projector/Assignment.html:59 msgid "ballot" msgstr "Wahlgang" @@ -603,15 +611,15 @@ msgstr "" "E: %(ABSTAIN)s" #: assignment/views.py:454 assignment/templates/assignment/poll_view.html:35 -#: assignment/templates/assignment/view.html:185 +#: assignment/templates/assignment/view.html:203 #: assignment/templates/projector/Assignment.html:97 #: motion/templates/motion/poll_view.html:31 msgid "Invalid votes" msgstr "Ungültige Stimmen" #: assignment/views.py:461 assignment/templates/assignment/poll_view.html:45 -#: assignment/templates/assignment/view.html:202 -#: assignment/templates/assignment/view.html:207 +#: assignment/templates/assignment/view.html:220 +#: assignment/templates/assignment/view.html:225 #: assignment/templates/projector/Assignment.html:111 #: assignment/templates/projector/Assignment.html:117 motion/views.py:804 #: motion/templates/motion/poll_view.html:35 @@ -641,22 +649,24 @@ msgstr[0] "%d Kandidat/in" msgstr[1] "%d Kandidaten/innen" #: assignment/views.py:545 -#, python-format -msgid "%d available posts" -msgstr "%d verfügbare Posten" +#, fuzzy, python-format +msgid "%d available post" +msgid_plural "%d available posts" +msgstr[0] "%d verfügbare Posten" +msgstr[1] "%d verfügbare Posten" -#: assignment/views.py:577 assignment/templates/assignment/view.html:168 +#: assignment/views.py:578 assignment/templates/assignment/view.html:186 #: assignment/templates/projector/Assignment.html:80 motion/views.py:804 #: motion/views.py:857 motion/templates/motion/view.html:81 #: motion/templates/projector/Motion.html:39 msgid "Abstention" msgstr "Enthaltung" -#: assignment/views.py:656 +#: assignment/views.py:657 msgid "Election settings successfully saved." msgstr "Wahl-Einstellungen wurden erfolgreich gespeichert." -#: assignment/views.py:676 +#: assignment/views.py:677 msgid "Assignments" msgstr "Wahlen" @@ -681,17 +691,17 @@ msgstr "Wahl anzeigen" #: assignment/templates/assignment/base_assignment.html:39 #: assignment/templates/assignment/edit.html:8 #: assignment/templates/assignment/edit.html:17 -#: assignment/templates/assignment/overview.html:44 +#: assignment/templates/assignment/overview.html:49 msgid "Edit election" msgstr "Wahl bearbeiten" #: assignment/templates/assignment/base_assignment.html:44 -#: assignment/templates/assignment/overview.html:45 +#: assignment/templates/assignment/overview.html:50 msgid "Delete election" msgstr "Wahl löschen" #: assignment/templates/assignment/base_assignment.html:50 -#: assignment/templates/assignment/overview.html:47 +#: assignment/templates/assignment/overview.html:52 msgid "Election as PDF" msgstr "Wahl als PDF" @@ -727,7 +737,15 @@ msgid_plural "elections" msgstr[0] "Wahl" msgstr[1] "Wahlen" -#: assignment/templates/assignment/overview.html:39 +#: assignment/templates/assignment/overview.html:35 +msgid "posts" +msgstr "Posten" + +#: assignment/templates/assignment/overview.html:37 +msgid "candidates" +msgstr "Kandidaten/innen" + +#: assignment/templates/assignment/overview.html:44 msgid "Activate election" msgstr "Wahl projizieren" @@ -761,7 +779,8 @@ msgid "Change status" msgstr "Status ändern" #: assignment/templates/assignment/view.html:43 -#: assignment/templates/assignment/view.html:96 +#: assignment/templates/assignment/view.html:99 +#: assignment/templates/assignment/view.html:113 msgid "Remove candidate" msgstr "Kandidate/in entfernen" @@ -783,49 +802,61 @@ msgid "Add new participant" msgstr "Neue/n Teilnehmer/in hinzufügen" #: assignment/templates/assignment/view.html:92 +msgid "Elected Candidates" +msgstr "Gewählte Kandidaten/innen" + +#: assignment/templates/assignment/view.html:104 +msgid "No elected candidates available." +msgstr "Keine gewählten Kandidaten/innen vorhanden." + +#: assignment/templates/assignment/view.html:109 msgid "Blocked Candidates" msgstr "Blockierte Kandidaten/innen" -#: assignment/templates/assignment/view.html:99 -msgid "There are no blocked candidates." -msgstr "Keine blockierten Kandidaten verfügbar." +#: assignment/templates/assignment/view.html:116 +msgid "No blocked candidates available." +msgstr "Keine blockierten Kandidaten/innen vorhanden." -#: assignment/templates/assignment/view.html:103 +#: assignment/templates/assignment/view.html:121 #: assignment/templates/projector/Assignment.html:52 msgid "Election results" msgstr "Wahlergebnisse" -#: assignment/templates/assignment/view.html:126 +#: assignment/templates/assignment/view.html:144 msgid "Publish/unpublish results" msgstr "Ergebnisse veröffentlichen/unveröffentlichen" -#: assignment/templates/assignment/view.html:138 -#: assignment/templates/assignment/view.html:226 +#: assignment/templates/assignment/view.html:156 +#: assignment/templates/assignment/view.html:244 msgid "New ballot" msgstr "Neuer Wahlgang" -#: assignment/templates/assignment/view.html:153 +#: assignment/templates/assignment/view.html:171 #: assignment/templates/projector/Assignment.html:69 msgid "Candidate is elected" msgstr "Kandidat/in ist gewählt" -#: assignment/templates/assignment/view.html:172 +#: assignment/templates/assignment/view.html:190 #: assignment/templates/projector/Assignment.html:84 msgid "was not a
    candidate" msgstr "war kein Kandidat" -#: assignment/templates/assignment/view.html:190 +#: assignment/templates/assignment/view.html:208 #: assignment/templates/projector/Assignment.html:101 motion/views.py:804 #: motion/templates/motion/view.html:82 #: motion/templates/projector/Motion.html:40 msgid "Invalid" msgstr "Ungültig" -#: assignment/templates/assignment/view.html:221 -#: assignment/templates/projector/Assignment.html:126 +#: assignment/templates/assignment/view.html:239 +#: assignment/templates/projector/Assignment.html:128 msgid "No ballots available." msgstr "Keine Wahlgänge vorhanden." +#: assignment/templates/projector/Assignment.html:126 +msgid "Vote results are not published yet." +msgstr "Wahlergebnisse sind noch nicht veröffentlicht." + #: config/forms.py:24 msgid "Event name" msgstr "Veranstaltungsname" @@ -1118,11 +1149,15 @@ msgstr "von" #: motion/models.py:454 motion/templates/motion/view.html:210 #: motion/templates/motion/widget.html:27 #: motion/templates/projector/Motion.html:65 +#: participant/templates/participant/personal_info_widget.html:13 +#: participant/templates/participant/personal_info_widget.html:32 msgid "no number" msgstr "ohne Nummer" #: motion/models.py:455 motion/templates/motion/overview.html:32 #: motion/templates/motion/widget.html:23 +#: participant/templates/participant/personal_info_widget.html:9 +#: participant/templates/participant/personal_info_widget.html:28 msgid "motion" msgstr "Antrag" @@ -1652,15 +1687,15 @@ msgstr "Abstimmungsergebnis" #: motion/templates/projector/Motion.html:47 msgid "No poll results available." -msgstr "Keine Abstimmungen vorhanden." +msgstr "Keine Abstimmungsergebnisse vorhanden." #: participant/__init__.py:3 msgid "Participant" msgstr "Teilnehmer" #: participant/forms.py:26 -#: participant/templates/participant/group_overview.html:6 -#: participant/templates/participant/group_overview.html:9 +#: participant/templates/participant/group_overview.html:7 +#: participant/templates/participant/group_overview.html:10 msgid "User groups" msgstr "Benutzerrollen" @@ -1668,7 +1703,7 @@ msgstr "Benutzerrollen" msgid "Permissions" msgstr "Rechte" -#: participant/forms.py:47 participant/views.py:495 +#: participant/forms.py:47 participant/views.py:530 #: participant/templates/participant/base_participant.html:12 #: participant/templates/participant/overview.html:7 #: participant/templates/participant/overview.html:18 @@ -1735,6 +1770,7 @@ msgid "Will be shown after the name." msgstr "Wird nach dem Namen angezeigt." #: participant/models.py:45 participant/templates/participant/overview.html:24 +#: participant/templates/participant/user_detail.html:24 msgid "Gender" msgstr "Geschlecht" @@ -1746,9 +1782,10 @@ msgstr "Nur zum Filtern der Teilnehmerliste." msgid "Typ" msgstr "Typ" -#: participant/models.py:50 participant/views.py:217 +#: participant/models.py:50 participant/views.py:245 #: participant/templates/participant/overview.html:45 #: participant/templates/participant/overview.html:70 +#: participant/templates/participant/user_detail.html:34 msgid "Committee" msgstr "Amt" @@ -1760,98 +1797,99 @@ msgstr "Nur für Notizen." msgid "Default password" msgstr "Vorgegebenes Passwort" -#: participant/models.py:102 +#: participant/models.py:105 msgid "Can see participant" msgstr "Darf die Teilnehmer/inen sehen" -#: participant/models.py:104 +#: participant/models.py:107 msgid "Can manage participant" msgstr "Darf die Teilnehmer/inen verwalten" -#: participant/models.py:113 +#: participant/models.py:116 msgid "Use this user group as participant" msgstr "Verwende diese Benutzerrolle als Teilnehmer/in" -#: participant/models.py:113 +#: participant/models.py:116 msgid "For example as submitter of a motion." msgstr "Zum Beispiel als Antragsteller." -#: participant/models.py:192 +#: participant/models.py:198 msgid "Welcome to OpenSlides!" msgstr "Willkommen bei OpenSlides!" -#: participant/views.py:212 +#: participant/views.py:240 msgid "Participant-list" msgstr "Teilnehmerliste" -#: participant/views.py:213 +#: participant/views.py:241 msgid "List of Participants" msgstr "Teilnehmerliste" -#: participant/views.py:216 participant/templates/participant/overview.html:67 +#: participant/views.py:244 participant/templates/participant/overview.html:67 msgid "Last Name" msgstr "Nachname" -#: participant/views.py:216 participant/templates/participant/overview.html:66 +#: participant/views.py:244 participant/templates/participant/overview.html:66 msgid "First Name" msgstr "Vorname" -#: participant/views.py:216 +#: participant/views.py:244 msgid "Group" msgstr "Gruppe" -#: participant/views.py:216 participant/templates/participant/overview.html:37 +#: participant/views.py:244 participant/templates/participant/overview.html:37 #: participant/templates/participant/overview.html:69 +#: participant/templates/participant/user_detail.html:29 msgid "Type" msgstr "Typ" -#: participant/views.py:245 +#: participant/views.py:276 msgid "Participant-passwords" msgstr "Teilnehmer-Passwoerter" -#: participant/views.py:263 +#: participant/views.py:298 msgid "Account for OpenSlides" msgstr "Zugang für OpenSlides" -#: participant/views.py:265 +#: participant/views.py:300 #, python-format msgid "for %s" msgstr "für %s" -#: participant/views.py:268 +#: participant/views.py:303 #, python-format msgid "User: %s" msgstr "Nutzername: %s" -#: participant/views.py:272 +#: participant/views.py:307 #, python-format msgid "Password: %s" msgstr "Passwort: %s" -#: participant/views.py:277 +#: participant/views.py:312 #, python-format msgid "URL: %s" msgstr "URL: %s" -#: participant/views.py:319 +#: participant/views.py:354 #, python-format msgid "%d new participants were successfully imported." msgstr "%d neue Teilnehmer/innen wurden erfolgreich importiert." -#: participant/views.py:330 +#: participant/views.py:365 msgid "Do you really want to reset the password?" msgstr "Soll das Passwort wirklich zurückgesetzt werden?" -#: participant/views.py:343 +#: participant/views.py:378 #, python-format msgid "The Password for %s was successfully reset." msgstr "Das Passwort für %s wurde erfolgreich zurückgesetzt." -#: participant/views.py:422 +#: participant/views.py:457 msgid "Participants settings successfully saved." msgstr "Teilnehmer/innen-Einstellungen wurden erfolgreich gespeichert." -#: participant/views.py:432 +#: participant/views.py:467 #, python-format msgid "" "Installation was successfully! Use %(user)s (password: %(password)s) for " @@ -1864,14 +1902,27 @@ msgstr "" "Sie das Passwort nach der ersten Anmeldung! Anderenfalls erscheint diese " "Meldung weiterhin für alle und ist ein Sicherheitsrisiko." -#: participant/views.py:455 +#: participant/views.py:490 msgid "User settings successfully saved." msgstr "Nutzereinstellungen wurden erfolgreich gespeichert." -#: participant/views.py:477 +#: participant/views.py:512 msgid "Password successfully changed." msgstr "Passwort wurde erfolgreich geändert." +#: participant/views.py:562 +msgid "My motions and elections" +msgstr "Meine Anträge und Wahlen" + +#: participant/views.py:576 +msgid "Users" +msgstr "Benutzer" + +#: participant/views.py:590 +#: participant/templates/participant/user_detail.html:14 +msgid "Groups" +msgstr "Gruppen" + #: participant/templates/participant/base_participant.html:15 msgid "All participants" msgstr "Alle Teilnehmer/innen" @@ -1906,42 +1957,70 @@ msgstr "Teilnehmerliste als PDF" msgid "First time passwords as PDF" msgstr "Erst-Passwörter als PDF" -#: participant/templates/participant/config.html:5 -#: participant/templates/participant/config.html:8 -msgid "Participant settings" -msgstr "Teilnehmer/innen-Einstellungen" +#: participant/templates/participant/base_participant.html:38 +msgid "View participant" +msgstr "Teilnehmer/in anzeigen" +#: participant/templates/participant/base_participant.html:45 #: participant/templates/participant/edit.html:8 #: participant/templates/participant/edit.html:17 #: participant/templates/participant/overview.html:94 msgid "Edit participant" msgstr "Teilnehmer/in bearbeiten" +#: participant/templates/participant/base_participant.html:50 +#: participant/templates/participant/overview.html:97 +msgid "Delete participant" +msgstr "Teilnehmer/in löschen" + +#: participant/templates/participant/base_participant.html:60 +msgid "View group" +msgstr "Benutzerrolle anzeigen" + +#: participant/templates/participant/base_participant.html:65 +#: participant/templates/participant/group_overview.html:19 +msgid "Edit group" +msgstr "Benutzerrolle bearbeiten" + +#: participant/templates/participant/base_participant.html:71 +#: participant/templates/participant/group_overview.html:21 +msgid "Delete group" +msgstr "Benutzerrolle löschen" + +#: participant/templates/participant/config.html:5 +#: participant/templates/participant/config.html:8 +msgid "Participant settings" +msgstr "Teilnehmer/innen-Einstellungen" + #: participant/templates/participant/edit.html:26 msgid "Reset to First Password" msgstr "Auf Erst-Passwort zurücksetzen" +#: participant/templates/participant/group_detail.html:14 +msgid "Members" +msgstr "Mitglieder" + +#: participant/templates/participant/group_detail.html:19 +msgid "No members available." +msgstr "Keine Mitglieder vorhanden." + #: participant/templates/participant/group_edit.html:8 #: participant/templates/participant/group_edit.html:16 msgid "Edit user group" msgstr "Benutzerrolle bearbeiten" -#: participant/templates/participant/group_overview.html:12 +#: participant/templates/participant/group_overview.html:13 msgid "User Group" msgstr "Benutzerrolle" -#: participant/templates/participant/group_overview.html:18 -msgid "Edit group" -msgstr "Benutzerrolle bearbeiten" - -#: participant/templates/participant/group_overview.html:20 -msgid "Delete group" -msgstr "Benutzerrolle löschen" - -#: participant/templates/participant/group_overview.html:26 +#: participant/templates/participant/group_overview.html:27 msgid "No user groups available." msgstr "Keine Benutzerrollen vorhanden." +#: participant/templates/participant/group_widget.html:24 +msgid "No groups available." +msgstr "Keine Gruppen vorhanden." + #: participant/templates/participant/import.html:9 msgid "Select a CSV file to import participants!" msgstr "Wählen Sie eine CSV-Datei zum Importieren von Teilnehmer/innen aus!" @@ -2000,13 +2079,10 @@ msgid "of" msgstr "von" #: participant/templates/participant/overview.html:73 +#: participant/templates/participant/user_detail.html:44 msgid "Last Login" msgstr "Letzer Login" -#: participant/templates/participant/overview.html:97 -msgid "Delete participant" -msgstr "Teilnehmer/in löschen" - #: participant/templates/participant/overview.html:99 msgid "Change status to inactive" msgstr "Status ändern auf inaktiv" @@ -2016,6 +2092,7 @@ msgid "Change status to active" msgstr "Status ändern auf aktiv" #: participant/templates/participant/overview.html:111 +#: participant/templates/participant/user_widget.html:22 msgid "No participants available." msgstr "Keine Teilnehmer/innen vorhanden." @@ -2038,6 +2115,32 @@ msgstr "Benutzereinstellungen" msgid "Personal Settings" msgstr "Persönliche Einstellungen" +#: participant/templates/participant/personal_info_widget.html:5 +msgid "I submitted the following motions:" +msgstr "Ich habe folgende Anträge gestellt:" + +#: participant/templates/participant/personal_info_widget.html:17 +#: participant/templates/participant/personal_info_widget.html:36 +#: participant/templates/participant/personal_info_widget.html:47 +msgid "None" +msgstr "Keine" + +#: participant/templates/participant/personal_info_widget.html:24 +msgid "I support the following motions:" +msgstr "Ich unterstütze folgende Anträge:" + +#: participant/templates/participant/personal_info_widget.html:43 +msgid "I am candidate for the following elections:" +msgstr "Ich bin Kandidat/in bei folgenden Wahlen:" + +#: participant/templates/participant/user_detail.html:19 +msgid "The participant is not member of any group." +msgstr "Teilnehmer/in ist kein Mitglieder einer Gruppe." + +#: participant/templates/participant/user_detail.html:48 +msgid "The participant has not logged in yet." +msgstr "Teilnehmer/in hat sich noch nicht angemeldet." + #: poll/models.py:95 msgid "Votes invalid" msgstr "Ungültige Stimmen" @@ -2058,23 +2161,23 @@ msgstr "Darf den Projektor sehen" msgid "Can see the dashboard" msgstr "Darf das Dashboard sehen" -#: projector/views.py:202 +#: projector/views.py:204 msgid "Errors in the form" msgstr "Fehler im Formular" -#: projector/views.py:378 projector/templates/projector/dashboard.html:17 +#: projector/views.py:383 projector/templates/projector/dashboard.html:17 msgid "Dashboard" msgstr "Dashboard" -#: projector/views.py:406 +#: projector/views.py:411 msgid "Projector live view" msgstr "Projektor-Live-Ansicht" -#: projector/views.py:432 +#: projector/views.py:437 msgid "Overlays" msgstr "Einblendungen" -#: projector/views.py:445 +#: projector/views.py:450 msgid "Custom Slides" msgstr "Benutzerdefinierte Folien" @@ -2242,6 +2345,3 @@ msgstr "undefinierter-dateiname" #: utils/jsonfield/fields.py:21 msgid "Enter valid JSON" msgstr "Gebe valides JSON ein" - -#~ msgid "Users" -#~ msgstr "Benutzer" diff --git a/openslides/participant/templates/participant/group_detail.html b/openslides/participant/templates/participant/group_detail.html index e4896ae17..fb456c31c 100644 --- a/openslides/participant/templates/participant/group_detail.html +++ b/openslides/participant/templates/participant/group_detail.html @@ -16,7 +16,7 @@ {% for member in group.user_set.all %}

    {{ member }}

    {% empty %} -

    {% trans "This group has not any members." %}

    +

    {% trans "No members available." %}

    {% endfor %} {% endblock %} diff --git a/openslides/participant/templates/participant/personal_info_widget.html b/openslides/participant/templates/participant/personal_info_widget.html index 5b300a599..260469b59 100644 --- a/openslides/participant/templates/participant/personal_info_widget.html +++ b/openslides/participant/templates/participant/personal_info_widget.html @@ -2,7 +2,7 @@ {% load tags %}
      - {% trans "You submitted the following motions:" %} + {% trans "I submitted the following motions:" %} {% for motion in submitted_motions %}
    • {{ motion.public_version.title }} @@ -14,14 +14,14 @@ {% endif %}
      • {% empty %} -
    • {% trans "Currently none" %}
      • +
    • {% trans "None" %}
      • {% endfor %}
    {% if config_motion_min_supporters %}
      - {% trans "You support the following motions:" %} + {% trans "I support the following motions:" %} {% for motion in supported_motions %}
    • {{ motion.public_version.title }} @@ -33,17 +33,17 @@ {% endif %}
      • {% empty %} -
    • {% trans "Currently none" %}
      • +
    • {% trans "None" %}
      • {% endfor %}
    {% endif %}
      - {% trans "You are candidate in the following assignments:" %} + {% trans "I am candidate for the following elections:" %} {% for assignment in assignments %}
    • {{ assignment }}
      • {% empty %} -
    • {% trans "Currently none" %}
      • +
    • {% trans "None" %}
      • {% endfor %}
    diff --git a/openslides/participant/templates/participant/user_detail.html b/openslides/participant/templates/participant/user_detail.html index b7a0e50ff..e1af3f4e4 100644 --- a/openslides/participant/templates/participant/user_detail.html +++ b/openslides/participant/templates/participant/user_detail.html @@ -45,7 +45,7 @@ {% if shown_user.last_login > shown_user.date_joined %}

    {{ shown_user.last_login }}

    {% else %} -

    {% trans "The participant was not logged in yet." %}

    +

    {% trans "The participant has not logged in yet." %}

    {% endif %} {% endif %} diff --git a/openslides/participant/templates/participant/user_widget.html b/openslides/participant/templates/participant/user_widget.html index e8657cb17..00082aac7 100644 --- a/openslides/participant/templates/participant/user_widget.html +++ b/openslides/participant/templates/participant/user_widget.html @@ -19,6 +19,6 @@ {{ user }}
    • {% empty %} -
  • {% trans 'No users available.' %}
    • +
  • {% trans 'No participants available.' %}
    • {% endfor %} diff --git a/openslides/participant/views.py b/openslides/participant/views.py index d47271f1a..8c53601fb 100644 --- a/openslides/participant/views.py +++ b/openslides/participant/views.py @@ -559,7 +559,7 @@ def get_personal_info_widget(request): assignmentcandidate__blocked=False),} return Widget( name='personal_info', - display_name=_('On You'), + display_name=_('My motions and elections'), template='participant/personal_info_widget.html', context=personal_info_context, permission_required=None, From a363efe2efbf48793233d758fc430a40381c310d Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Sat, 3 Nov 2012 09:34:42 +0100 Subject: [PATCH 4/4] Fixed #390: Added new user field 'about me' --- openslides/locale/de/LC_MESSAGES/django.mo | Bin 35393 -> 35478 bytes openslides/locale/de/LC_MESSAGES/django.po | 33 +++++++++++------- openslides/participant/forms.py | 6 ++-- openslides/participant/models.py | 3 ++ .../templates/participant/user_detail.html | 5 +++ 5 files changed, 32 insertions(+), 15 deletions(-) diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo index 52ad807ebac44a66d0b4d7cbd654d930ac159766..f089d3c78b16724930b9f2977ab37d78ee082af6 100644 GIT binary patch delta 10421 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 k-l)n?BlEIbpK\n" "Language-Team: support@openslides.de\n" @@ -41,9 +41,9 @@ msgid "Text" msgstr "Text" #: agenda/models.py:44 agenda/templates/agenda/overview.html:65 -#: agenda/templates/agenda/view.html:13 participant/models.py:53 +#: agenda/templates/agenda/view.html:13 participant/models.py:56 #: participant/templates/participant/overview.html:72 -#: participant/templates/participant/user_detail.html:40 +#: participant/templates/participant/user_detail.html:45 msgid "Comment" msgstr "Kommentar" @@ -392,7 +392,7 @@ msgstr "Abgeschlossen" msgid "Name" msgstr "Name" -#: assignment/models.py:55 participant/models.py:117 +#: assignment/models.py:55 participant/models.py:120 msgid "Description" msgstr "Beschreibung" @@ -1789,31 +1789,40 @@ msgstr "Typ" msgid "Committee" msgstr "Amt" +#: participant/models.py:53 +#: participant/templates/participant/user_detail.html:39 +msgid "About me" +msgstr "Über mich" + #: participant/models.py:54 +msgid "Your profile text" +msgstr "Ihr Profiltext" + +#: participant/models.py:57 msgid "Only for notes." msgstr "Nur für Notizen." -#: participant/models.py:57 +#: participant/models.py:60 msgid "Default password" msgstr "Vorgegebenes Passwort" -#: participant/models.py:105 +#: participant/models.py:108 msgid "Can see participant" msgstr "Darf die Teilnehmer/inen sehen" -#: participant/models.py:107 +#: participant/models.py:110 msgid "Can manage participant" msgstr "Darf die Teilnehmer/inen verwalten" -#: participant/models.py:116 +#: participant/models.py:119 msgid "Use this user group as participant" msgstr "Verwende diese Benutzerrolle als Teilnehmer/in" -#: participant/models.py:116 +#: participant/models.py:119 msgid "For example as submitter of a motion." msgstr "Zum Beispiel als Antragsteller." -#: participant/models.py:198 +#: participant/models.py:201 msgid "Welcome to OpenSlides!" msgstr "Willkommen bei OpenSlides!" @@ -2079,7 +2088,7 @@ msgid "of" msgstr "von" #: participant/templates/participant/overview.html:73 -#: participant/templates/participant/user_detail.html:44 +#: participant/templates/participant/user_detail.html:49 msgid "Last Login" msgstr "Letzer Login" @@ -2137,7 +2146,7 @@ msgstr "Ich bin Kandidat/in bei folgenden Wahlen:" msgid "The participant is not member of any group." msgstr "Teilnehmer/in ist kein Mitglieder einer Gruppe." -#: participant/templates/participant/user_detail.html:48 +#: participant/templates/participant/user_detail.html:53 msgid "The participant has not logged in yet." msgstr "Teilnehmer/in hat sich noch nicht angemeldet." diff --git a/openslides/participant/forms.py b/openslides/participant/forms.py index 672b3ae4e..2f4739558 100644 --- a/openslides/participant/forms.py +++ b/openslides/participant/forms.py @@ -28,14 +28,14 @@ class UserCreateForm(forms.ModelForm, CssClassMixin): class Meta: model = User fields = ('first_name', 'last_name', 'is_active', 'groups', 'detail', - 'gender', 'type', 'committee', 'comment', 'default_password') + 'gender', 'type', 'committee', 'about_me', 'comment', 'default_password') class UserUpdateForm(UserCreateForm): class Meta: model = User fields = ('username', 'first_name', 'last_name', 'is_active', 'groups', - 'detail', 'gender', 'type', 'committee', 'comment', + 'detail', 'gender', 'type', 'committee', 'about_me', 'comment', 'default_password') @@ -94,7 +94,7 @@ class GroupForm(forms.ModelForm, CssClassMixin): class UsersettingsForm(forms.ModelForm, CssClassMixin): class Meta: model = User - fields = ('username', 'first_name', 'last_name', 'email', 'gender') + fields = ('username', 'first_name', 'last_name', 'gender', 'email', 'committee', 'about_me' ) class UserImportForm(forms.Form, CssClassMixin): diff --git a/openslides/participant/models.py b/openslides/participant/models.py index 36260055a..17c5ef832 100644 --- a/openslides/participant/models.py +++ b/openslides/participant/models.py @@ -49,6 +49,9 @@ class User(DjangoUser, PersonMixin, Person): committee = models.CharField( max_length=100, blank=True, default='', verbose_name=_("Committee"), help_text=_('Only for filtering the participant list.')) + about_me = models.TextField( + blank=True, default='', verbose_name=_('About me'), + help_text=_('Your profile text')) comment = models.TextField( blank=True, default='', verbose_name=_('Comment'), help_text=_('Only for notes.')) diff --git a/openslides/participant/templates/participant/user_detail.html b/openslides/participant/templates/participant/user_detail.html index e1af3f4e4..cf738c6b2 100644 --- a/openslides/participant/templates/participant/user_detail.html +++ b/openslides/participant/templates/participant/user_detail.html @@ -35,6 +35,11 @@

    {{ shown_user.committee }}

    {% endif %} +{% if shown_user.about_me %} +

    {% trans "About me" %}

    +

    {{ shown_user.about_me }}

    +{% endif %} + {% if perms.participant.can_manage_participant %} {% if shown_user.comment %}

    {% trans "Comment" %}