From bd3bf9fb6f70d247c076bc76a9d675013b805ace Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Sun, 15 Apr 2012 09:27:57 +0200 Subject: [PATCH 1/4] Updated translation. --- openslides/locale/de/LC_MESSAGES/django.mo | Bin 30414 -> 30392 bytes openslides/locale/de/LC_MESSAGES/django.po | 36 ++++++++++----------- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo index 8c5ea0eb12d2137c6efde331f99d94743656987b..e8139541a07bf089d36a2af18667dd307ed2b208 100644 GIT binary patch delta 3143 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\n" "Language-Team: LANGUAGE \n" @@ -1720,11 +1720,11 @@ msgstr "Typ" #: participant/templates/participant/overview.html:51 projector/models.py:35 msgid "Active" -msgstr "Aktiv (anwesend)" +msgstr "Aktiv" #: participant/templates/participant/overview.html:52 msgid "Inactive" -msgstr "Inaktiv (abwesend)" +msgstr "Inaktiv" #: participant/templates/participant/overview.html:59 msgid "of" @@ -1779,11 +1779,11 @@ msgstr "Darf den Beamer sehen" msgid "Projector Slide" msgstr "Beamer-Folie" -#: projector/projector.py:73 +#: projector/projector.py:79 msgid "Countdown" msgstr "Countdown" -#: projector/views.py:192 projector/templates/projector/base_projector.html:7 +#: projector/views.py:203 projector/templates/projector/base_projector.html:7 #: projector/templates/projector/base_projector.html:12 #: projector/templates/projector/control.html:36 msgid "Projector" @@ -1827,40 +1827,39 @@ msgstr "Text nach unten scrollen" msgid "Reset projector view" msgstr "Beamer-Ansicht zurücksetzen" -#: projector/templates/projector/control.html:73 -#: projector/templates/projector/control.html:124 -msgid "Select item overview" -msgstr "Wähle Eintragsübersicht" - -#: projector/templates/projector/control.html:97 +#: projector/templates/projector/control.html:83 msgid "Projector Live View" msgstr "Beamer-Live-Ansicht" -#: projector/templates/projector/control.html:100 +#: projector/templates/projector/control.html:86 msgid "Open Projector view" msgstr "Beamer-Ansicht öffnen" -#: projector/templates/projector/control.html:112 +#: projector/templates/projector/control.html:98 msgid "Static Slides" msgstr "Statische Folien" -#: projector/templates/projector/control.html:145 +#: projector/templates/projector/control.html:110 +msgid "Select item overview" +msgstr "Wähle Eintragsübersicht" + +#: projector/templates/projector/control.html:131 msgid "Messages" msgstr "Nachrichten" -#: projector/templates/projector/control.html:156 +#: projector/templates/projector/control.html:142 msgid "sec" msgstr "s" -#: projector/templates/projector/control.html:157 +#: projector/templates/projector/control.html:143 msgid "Reset countdown" msgstr "Countdown zurücksetzen" -#: projector/templates/projector/control.html:160 +#: projector/templates/projector/control.html:146 msgid "Start countdown" msgstr "Countdown starten" -#: projector/templates/projector/control.html:163 +#: projector/templates/projector/control.html:149 msgid "Stop countdown" msgstr "Countdown stoppen" @@ -1947,4 +1946,3 @@ msgstr "Bedaure, Sie haben keine Berechtigung diese Seite zu sehen." #: utils/views.py:207 msgid "undefined-filename" msgstr "undefinierter-dateiname" - From 36ca26493181a54ee2fbf0bd488bb1a2152287bf Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Sun, 15 Apr 2012 09:35:51 +0200 Subject: [PATCH 2/4] Remove superuser function. --- openslides/participant/forms.py | 6 +++--- .../static/images/icons/im-user.png | Bin 746 -> 0 bytes .../static/images/icons/meeting-chair.png | Bin 752 -> 0 bytes .../static/javascript/participant.js | 19 ------------------ .../participant/static/styles/participant.css | 17 ---------------- .../templates/participant/overview.html | 5 ----- openslides/participant/urls.py | 12 ----------- openslides/participant/views.py | 19 ------------------ 8 files changed, 3 insertions(+), 75 deletions(-) delete mode 100644 openslides/participant/static/images/icons/im-user.png delete mode 100644 openslides/participant/static/images/icons/meeting-chair.png diff --git a/openslides/participant/forms.py b/openslides/participant/forms.py index 13db3fc3a..409f8dd23 100644 --- a/openslides/participant/forms.py +++ b/openslides/participant/forms.py @@ -35,7 +35,7 @@ class UserNewForm(ModelForm, CssClassMixin): class Meta: model = User - exclude = ('username', 'password', 'is_staff', 'last_login', 'date_joined', 'user_permissions') + exclude = ('username', 'password', 'is_staff', 'is_superuser', 'last_login', 'date_joined', 'user_permissions') class UserEditForm(ModelForm, CssClassMixin): @@ -44,13 +44,13 @@ class UserEditForm(ModelForm, CssClassMixin): class Meta: model = User - exclude = ('password', 'is_staff', 'last_login', 'date_joined', 'user_permissions') + exclude = ('password', 'is_staff', 'is_superuser', 'last_login', 'date_joined', 'user_permissions') class UsernameForm(ModelForm, CssClassMixin): class Meta: model = User - exclude = ('first_name', 'last_name', 'email', 'is_active','is_superuser', 'groups', 'password', 'is_staff', 'last_login', 'date_joined', 'user_permissions') + exclude = ('first_name', 'last_name', 'email', 'is_active', 'is_superuser', 'groups', 'password', 'is_staff', 'last_login', 'date_joined', 'user_permissions') class ProfileForm(ModelForm, CssClassMixin): diff --git a/openslides/participant/static/images/icons/im-user.png b/openslides/participant/static/images/icons/im-user.png deleted file mode 100644 index 1d3adc250dbb7f79e1ffdcb8d480169f81b27310..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 746 zcmVPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L02{9W02{9XUK)`c00007bV*G`2iXA@ z7a|-REom+Q00L@BL_t(|+KrM)OcP-khTrZp|8%A;h1P-*FhVgdZCyy9q(Z`hm}oSZ zxWofDZia)wcrfu~j2GiYFCH~9-Y^mq4+Jz;z$JnRZ4nS-2?aWIo28w0#>l~#TEyq_ zpS~~8_vF{10?s3Sx>B*&PtnYUYPSb^o$hgRJ@GIezOSJSBPw8b*l!CtaWK#tL{~5X zMNv*Xdoj8v9>xunp+_05=WlW}u?%qbDsUW!lB%M{PCy8`+R`(~>}cR{+B`O!)jS`I zBgylai5ij57f{Fx6w47efW?0rVGIkVb}~G4gVprwO$H06Rv! z_F!0_SlxU&{${>W%IM+d+^A-&YK5#k)ZKrV-f=-)t>g0KM6})O^P#?BH(I=Vap~e| zSSYqxRZ3U>vc(^C_T2&@=0|hUgv;S{!D=O2nalH;uUaY3=99!sawFi;vOnue-suw+cg7Yg7v){xJOU|HhZ*1+koDs3Hp zyc(HAQd1#I0!&8Z)|*YO!{={8AkZW|-!7tyb;Ls5!O+q6fQz!|pjRajN<-5=4^E!y z#366p%zSus;M0e~Wiuoc5!lIL8@MUQTpt6Hc~*@+h z8>iQAm{x!L`jtZ)7Fb$ZJ-mI*$=Sor!$(U?%f{9&zo@pjyk1#FU0p*PXgD7qA3s08 zkdTmwh=`b&n7Ft&&;cNK$jT}yDXFTes;Q{~Ed}b;(a|wBHZ}p;YHI51>jwk@0Rcfl zK_MZbKoAxdmY0{8pPye;R8(ACJY&XeAehg`H@_uw&BUVh0s>pMZr{3f$M)$J`ve6K ztekM>!1lAk!k5=ixGExY{n(aUx9>eUyY1Hh;W% z=+l#{pFe*3{N?+X+XuefIrQb>*>6Df*?YcB5^r6fq_X((^lP9Q;f~x!S?dv;?2*UIW!`oqNAg`4*y)FCZND29_W8o zPsekbV@9CQX+5oT0&W~1j-@{p&oEM8-1_B=NMs7*&kZXA3{~uQm-+cDVq;fsIj*+k zkz9z>Z0R@abWU&yP5Atk|BIft#%I0{pC__$zNoIO+VSk@)14I+6)Yme z(bJ5t&#!C_50BEdFtKN86CVmLOM503#>B&O#%9v0UB}uK+1#wWgzot8Fl?Tvy!)r; SIc1 - - - {% endif %} diff --git a/openslides/participant/urls.py b/openslides/participant/urls.py index f24f99b4d..3d1b39e5d 100644 --- a/openslides/participant/urls.py +++ b/openslides/participant/urls.py @@ -51,18 +51,6 @@ urlpatterns = patterns('participant.views', name='user_inactive', ), - url(r'^(?P\d+)/superuser/$', - 'user_set_superuser', - {'superuser': True}, - name='user_superuser', - ), - - url(r'^(?P\d+)/normaluser/$', - 'user_set_superuser', - {'superuser': False}, - name='user_normaluser', - ), - url(r'^import$', 'user_import', name='user_import', diff --git a/openslides/participant/views.py b/openslides/participant/views.py index d9323173a..e6bb42077 100644 --- a/openslides/participant/views.py +++ b/openslides/participant/views.py @@ -187,25 +187,6 @@ def user_delete(request, user_id): gen_confirm_form(request, _('Do you really want to delete %s?') % user, reverse('user_delete', args=[user_id])) return redirect(reverse('user_overview')) -@permission_required('participant.can_manage_participant') -@template('confirm.html') -def user_set_superuser(request, user_id, superuser=True): - try: - user = User.objects.get(pk=user_id) - user.is_superuser = superuser - user.save() - except User.DoesNotExist: - messages.error(request, _('Participant %d does not exist.') % int(user_id)) - - if request.is_ajax(): - if superuser: - link = reverse('user_normaluser', args=[user.id]) - else: - link = reverse('user_superuser', args=[user.id]) - return ajax_request({'superuser': superuser, - 'link': link}) - return redirect(reverse('user_overview')) - @permission_required('participant.can_manage_participant') @template('confirm.html') def user_set_active(request, user_id, active=True): From 8149686a041faf4b359929a1d22b35f3e93c027c Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Sun, 15 Apr 2012 09:48:01 +0200 Subject: [PATCH 3/4] Updated German translation from "Benutzergruppe" to "Benutzerrolle". Some translation fixes. --- .../templates/assignment/overview.html | 2 +- openslides/locale/de/LC_MESSAGES/django.mo | Bin 30392 -> 30230 bytes openslides/locale/de/LC_MESSAGES/django.po | 81 ++++++++---------- .../templates/participant/group_overview.html | 2 +- 4 files changed, 39 insertions(+), 46 deletions(-) diff --git a/openslides/assignment/templates/assignment/overview.html b/openslides/assignment/templates/assignment/overview.html index 6c3963bd1..69aed5def 100644 --- a/openslides/assignment/templates/assignment/overview.html +++ b/openslides/assignment/templates/assignment/overview.html @@ -22,7 +22,7 @@ {% blocktrans count counter=assignments|length %}election{% plural %}elections{% endblocktrans %} - + {% if perms.assignment.can_manage_assignment %} diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo index e8139541a07bf089d36a2af18667dd307ed2b208..3ea24ff5f79601dc1020eefaa6e6a69eb367817c 100644 GIT binary patch delta 8825 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 delta 8964 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\n" "Language-Team: LANGUAGE \n" @@ -116,7 +116,7 @@ msgid "Yes, with all child items." msgstr "Ja, mit allen Kindelementen." #: agenda/views.py:183 agenda/views.py:185 participant/views.py:187 -#: participant/views.py:300 utils/utils.py:47 utils/views.py:200 +#: participant/views.py:281 utils/utils.py:47 utils/views.py:200 #, python-format msgid "Do you really want to delete %s?" msgstr "Soll %s wirklich gelöscht werden?" @@ -224,6 +224,7 @@ msgstr "Erledigt" #: agenda/templates/agenda/overview.html:58 #: assignment/templates/assignment/overview.html:29 +#: participant/templates/participant/group_overview.html:13 #: participant/templates/participant/overview.html:71 msgid "Actions" msgstr "Aktionen" @@ -466,8 +467,8 @@ msgid "Application was successfully modified." msgstr "Antrag wurde erfolgreich geändert." #: application/views.py:198 application/views.py:597 assignment/views.py:129 -#: config/views.py:53 participant/views.py:164 participant/views.py:285 -#: participant/views.py:314 participant/views.py:472 utils/views.py:153 +#: config/views.py:53 participant/views.py:164 participant/views.py:266 +#: participant/views.py:295 participant/views.py:453 utils/views.py:153 msgid "Please check the form for errors." msgstr "Bitte kontrollieren Sie das Formular nach Fehlern." @@ -570,7 +571,7 @@ msgstr "FEHLER beim Zurückweisen der Version." msgid "Do you really want to reject version %s?" msgstr "Soll Version %s wirklich zurückgewiesen werden?" -#: application/views.py:493 participant/views.py:330 +#: application/views.py:493 participant/views.py:311 msgid "" "The import function is available for the superuser (without user profile) " "only." @@ -578,7 +579,7 @@ msgstr "" "Die Importfunktion ist nur für den 'superuser' (ohne Nutzerprofil) verfügbar." #: application/views.py:524 application/views.py:528 application/views.py:534 -#: application/views.py:537 participant/views.py:399 +#: application/views.py:537 participant/views.py:380 #, python-format msgid "Ignoring malformed line %d in import file." msgstr "Fehlerhafte Zeile %d der Quelldatei wurde ignoriert." @@ -604,11 +605,11 @@ msgid_plural "%d new users were added." msgstr[0] "%d neuer Nutzer wurde erstellt." msgstr[1] "%d neue Nutzer wurden erstellt." -#: application/views.py:593 participant/views.py:468 +#: application/views.py:593 participant/views.py:449 msgid "Import aborted because of severe errors in the input file." msgstr "Import auf Grund von schweren Fehlern in der Quelldatei abgebrochen." -#: application/views.py:595 participant/views.py:470 +#: application/views.py:595 participant/views.py:451 msgid "Import file has wrong character encoding, only UTF-8 is supported!" msgstr "" "Die Quelldatei benutzt eine ungültige Zeichenkodierung, es wird nur UTF-8 " @@ -1073,7 +1074,6 @@ msgstr "Darf Wahlen verwalten" #: assignment/templates/assignment/base_assignment.html:14 #: assignment/templates/assignment/overview.html:6 #: assignment/templates/assignment/overview.html:9 -#: assignment/templates/assignment/overview.html:25 msgid "Elections" msgstr "Wahlen" @@ -1153,6 +1153,7 @@ msgid "Assignment" msgstr "Wahl" #: assignment/views.py:317 assignment/templates/assignment/edit.html:5 +#: assignment/templates/assignment/overview.html:25 #: assignment/templates/projector/Assignment.html:13 utils/pdf.py:304 #: utils/pdf.py:313 msgid "Election" @@ -1483,50 +1484,50 @@ msgstr "Teilnehmer/in wurde erfolgreich geändert." msgid "Participant %s was successfully deleted." msgstr "Teilnehmer/in %s wurde erfolgreich gelöscht." -#: participant/views.py:198 participant/views.py:217 +#: participant/views.py:198 #, python-format msgid "Participant %d does not exist." msgstr "Teilnehmer/in %d existiert nicht." -#: participant/views.py:263 +#: participant/views.py:244 #, python-format msgid "Group name \"%s\" is reserved for internal use." msgstr "Der Gruppenname \"%s\" ist für interne Verwendung reserviert." -#: participant/views.py:277 +#: participant/views.py:258 msgid "New group was successfully created." msgstr "Neue Gruppe wurde erfolgreich angelegt." -#: participant/views.py:279 +#: participant/views.py:260 msgid "Group was successfully modified." msgstr "Gruppe wurde erfolgreich geändert." -#: participant/views.py:298 +#: participant/views.py:279 #, python-format msgid "Group %s was successfully deleted." msgstr "Gruppe %s wurde erfolgreich gelöscht." -#: participant/views.py:312 +#: participant/views.py:293 msgid "User settings successfully saved." msgstr "Nutzereinstellungen wurden erfolgreich gespeichert." -#: participant/views.py:382 +#: participant/views.py:363 msgid "Supporters removed after user import." msgstr "Unterstützer/innen nach Benutzerimport zurückgesetzt." -#: participant/views.py:435 +#: participant/views.py:416 #, python-format msgid "Reassigned to \"%s\" after (re)importing users." msgstr "Nach Benutzerimport erneut \"%s\" zugeordnet." -#: participant/views.py:438 participant/views.py:452 +#: participant/views.py:419 participant/views.py:433 #, python-format msgid "Could not reassing application %d - object not found!" msgstr "" "Antrag Id#%d konnte nicht neu zugewiesen werden - Das Objekt wurde nicht " "gefunden!" -#: participant/views.py:455 +#: participant/views.py:436 #, python-format msgid "%d application could not be reassigned and needs a review!" msgid_plural "%d applications could not be reassigned and need a review!" @@ -1535,26 +1536,26 @@ msgstr[0] "" msgstr[1] "" "%d Anträge konnten nicht neu zugewiesen werden und benötigen ein Review!" -#: participant/views.py:458 +#: participant/views.py:439 #, python-format msgid "%d application was successfully reassigned." msgid_plural "%d applications were successfully reassigned." msgstr[0] "%d Antrag wurde erfolgreich neu zugewiesen." msgstr[1] "%d Anträge wurden erfolgreich neu zugewiesen." -#: participant/views.py:461 +#: participant/views.py:442 #, python-format msgid "%d application was discarded." msgid_plural "%d applications were discarded." msgstr[0] "%d Antrag wurde gelöscht." msgstr[1] "%d Anträge wurden gelöscht." -#: participant/views.py:465 +#: participant/views.py:446 #, python-format msgid "%d new participants were successfully imported." msgstr "%d neue Teilnehmer/innen wurden erfolgreich importiert." -#: participant/views.py:474 +#: participant/views.py:455 msgid "" "Attention: All existing participants will be removed if you import new " "participants." @@ -1562,12 +1563,12 @@ msgstr "" "Achtung: Alle existierenden Teilnehmer/innen werden gelöscht, wenn Sie neue " "Teilnehmer/innen importieren." -#: participant/views.py:476 +#: participant/views.py:457 msgid "Attention: Supporters from all existing applications will be removed." msgstr "" "Achtung: Alle Unterstützer/innen werden von existiernden Anträgen gelöscht." -#: participant/views.py:477 +#: participant/views.py:458 msgid "" "Attention: Applications which can't be mapped to new users will be set to " "'Needs Review'." @@ -1575,17 +1576,17 @@ msgstr "" "Achtung: Anträge welche keinem Nutzer zugeordnet werden können bekommen " "automatisch den Status \"Benötigt Review\"." -#: participant/views.py:489 +#: participant/views.py:470 #, python-format msgid "The Password for %s was successfully reset." msgstr "Das Passwort für %s wurde erfolgreich zurückgesetzt." -#: participant/views.py:491 +#: participant/views.py:472 #, python-format msgid "Do you really want to reset the password for %s?" msgstr "Soll das Passwort für %s wirklich zurückgesetzt werden?" -#: participant/views.py:499 +#: participant/views.py:480 #: participant/templates/participant/base_participant.html:12 #: participant/templates/participant/overview.html:6 #: participant/templates/participant/overview.html:16 @@ -1605,12 +1606,12 @@ msgstr "Neue/r Teilnehmer/in" #: participant/templates/participant/base_participant.html:19 msgid "All user groups" -msgstr "Alle Benutzergruppen" +msgstr "Alle Benutzerrollen" #: participant/templates/participant/base_participant.html:20 #: participant/templates/participant/group_edit.html:11 msgid "New user group" -msgstr "Neue Benutzergruppe" +msgstr "Neue Benutzerrolle" #: participant/templates/participant/base_participant.html:21 #: participant/templates/participant/import.html:5 @@ -1642,11 +1643,11 @@ msgstr "Auf Erst-Passwort zurücksetzen" #: participant/templates/participant/group_edit.html:5 #: participant/templates/participant/group_overview.html:12 msgid "User Group" -msgstr "Benutzergruppe" +msgstr "Benutzerrolle" #: participant/templates/participant/group_edit.html:9 msgid "Edit user group" -msgstr "Benutzergruppe bearbeiten" +msgstr "Benutzerrolle bearbeiten" #: participant/templates/participant/group_overview.html:6 msgid "Groups" @@ -1654,22 +1655,18 @@ msgstr "Gruppen" #: participant/templates/participant/group_overview.html:9 msgid "User groups" -msgstr "Benutzergruppen" - -#: participant/templates/participant/group_overview.html:13 -msgid "Action" -msgstr "Aktionen" +msgstr "Benutzerrollen" #: participant/templates/participant/group_overview.html:18 msgid "Edit group" -msgstr "Benutzergruppe bearbeiten" +msgstr "Benutzerrolle bearbeiten" #: participant/templates/participant/group_overview.html:20 msgid "Delete group" -msgstr "Benutzergruppe löschen" +msgstr "Benutzerrolle löschen" #: participant/templates/participant/group_overview.html:26 -#: participant/templates/participant/overview.html:105 +#: participant/templates/participant/overview.html:100 msgid "No participants available." msgstr "Keine Teilnehmer/innen vorhanden." @@ -1750,10 +1747,6 @@ msgstr "Teilnehmer/in löschen" msgid "Change status (active/inactive)" msgstr "Status ändern (aktiv/inaktiv)" -#: participant/templates/participant/overview.html:96 -msgid "Change administrator rights (Superuser/Normal user)" -msgstr "Adminstratorrechte ändern (Superuser/normaler Nutzer)" - #: participant/templates/participant/settings.html:5 #: participant/templates/participant/settings.html:11 msgid "Your Settings" diff --git a/openslides/participant/templates/participant/group_overview.html b/openslides/participant/templates/participant/group_overview.html index c1400c6b4..ee685aa08 100644 --- a/openslides/participant/templates/participant/group_overview.html +++ b/openslides/participant/templates/participant/group_overview.html @@ -10,7 +10,7 @@
{%trans "Elections" %}{%trans "Election" %} {%trans "Candidates" %} {%trans "Status" %}
- + {% for group in groups %} From b1c86d4c19ca39d8161558dd6eb6cf617dc176ce Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Sun, 15 Apr 2012 10:07:45 +0200 Subject: [PATCH 4/4] Import template pages: Link to wiki page. --- .../templates/application/import.html | 9 +++- openslides/locale/de/LC_MESSAGES/django.mo | Bin 30230 -> 30384 bytes openslides/locale/de/LC_MESSAGES/django.po | 40 ++++++++++-------- .../templates/participant/import.html | 9 +++- 4 files changed, 38 insertions(+), 20 deletions(-) diff --git a/openslides/application/templates/application/import.html b/openslides/application/templates/application/import.html index de067c1c1..a1e84d078 100644 --- a/openslides/application/templates/application/import.html +++ b/openslides/application/templates/application/import.html @@ -8,7 +8,14 @@

{%trans "Import applications" %}

{% trans 'Select a CSV file to import applications!' %}

-

{% trans '(Required comma separated values: number, title, text, reason, first_name, last_name - number and reason are optional and may be empty)' %}

+

{% trans 'Required comma separated values: {number, title, text, reason, first_name, last_name} (number and reason are optional and may be empty)' %} +
+ {% trans 'Required CSV file encoding: UTF-8 (Unicode).' %} +

+ +

{% trans 'A CSV example file is available in OpenSlides Wiki.' %} +

+
{% csrf_token %} {{ form.as_p }}
{%trans "User Group" %}{%trans "Action" %}{%trans "Actions" %}