ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#174: Change form field 'groups' to 'user groups'.

Browse Source
This commit is contained in:
Emanuel Schuetze 2012-05-14 23:04:00 +02:00
parent 31ae7c38c9
commit 1d6a0bee4e
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
openslides/locale/de/LC_MESSAGES/django.mo
View File

Binary file not shown.

12
openslides/locale/de/LC_MESSAGES/django.po
View File

@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: OpenSlides 1.x\n" "Project-Id-Version: OpenSlides 1.x\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-05-14 22:06+0200\n" "POT-Creation-Date: 2012-05-14 22:39+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Emanuel Schuetze <emanuel@intevation.de>\n" "Last-Translator: Emanuel Schuetze <emanuel@intevation.de>\n"
"Language-Team: German\n" "Language-Team: German\n"
@ -1071,7 +1071,8 @@ msgstr "Teilnehmer/in vorschlagen"
#: assignment/forms.py:39 #: assignment/forms.py:39
msgid "Only publish voting results for selected winners (Projector view only)" msgid "Only publish voting results for selected winners (Projector view only)"
msgstr "Wahlergebnisse der nicht gewählten Kandidaten auf dem Projektor verbergen" msgstr ""
"Wahlergebnisse der nicht gewählten Kandidaten auf dem Projektor verbergen"
#: assignment/forms.py:59 #: assignment/forms.py:59
msgid "Title for PDF document (all elections)" msgid "Title for PDF document (all elections)"
@ -1516,6 +1517,10 @@ msgstr "Vorname"
msgid "Last name" msgid "Last name"
msgstr "Nachname" msgstr "Nachname"
#: participant/forms.py:62
msgid "Persmissions"
msgstr "Rechte"
#: participant/forms.py:82 #: participant/forms.py:82
msgid "For existing applications" msgid "For existing applications"
msgstr "Bei existierenden Anträgen" msgstr "Bei existierenden Anträgen"
@ -1820,9 +1825,6 @@ msgid "Edit user group"
msgstr "Benutzerrolle bearbeiten" msgstr "Benutzerrolle bearbeiten"
#: participant/templates/participant/group_overview.html:6 #: participant/templates/participant/group_overview.html:6
msgid "Groups"
msgstr "Gruppen"
#: participant/templates/participant/group_overview.html:9 #: participant/templates/participant/group_overview.html:9
msgid "User groups" msgid "User groups"
msgstr "Benutzerrollen" msgstr "Benutzerrollen"

4
openslides/participant/forms.py
View File

@ -32,6 +32,7 @@ USER_APPLICATION_IMPORT_OPTIONS = [
class UserNewForm(ModelForm, CssClassMixin): class UserNewForm(ModelForm, CssClassMixin):
first_name = CharField(label=_("First name")) first_name = CharField(label=_("First name"))
last_name = CharField(label=_("Last name")) last_name = CharField(label=_("Last name"))
groups = ModelMultipleChoiceField(queryset=Group.objects.all(), label=_("User groups"), required=False)
class Meta: class Meta:
model = User model = User
@ -41,6 +42,7 @@ class UserNewForm(ModelForm, CssClassMixin):
class UserEditForm(ModelForm, CssClassMixin): class UserEditForm(ModelForm, CssClassMixin):
first_name = CharField(label=_("First name")) first_name = CharField(label=_("First name"))
last_name = CharField(label=_("Last name")) last_name = CharField(label=_("Last name"))
groups = ModelMultipleChoiceField(queryset=Group.objects.all(), label=_("User groups"), required=False)
class Meta: class Meta:
model = User model = User
@ -59,7 +61,7 @@ class ProfileForm(ModelForm, CssClassMixin):
class GroupForm(ModelForm, CssClassMixin): class GroupForm(ModelForm, CssClassMixin):
permissions = LocalizedModelMultipleChoiceField(queryset=Permission.objects.all()) permissions = LocalizedModelMultipleChoiceField(queryset=Permission.objects.all(), label=_("Persmissions"))
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super(GroupForm, self).__init__(*args, **kwargs) super(GroupForm, self).__init__(*args, **kwargs)

2
openslides/participant/templates/participant/group_overview.html
View File

@ -3,7 +3,7 @@
{% load i18n %} {% load i18n %}
{% load staticfiles %} {% load staticfiles %}
{% block title %}{{ block.super }} - {%trans "Groups" %}{% endblock %} {% block title %}{{ block.super }} - {%trans "User groups" %}{% endblock %}
{% block content %} {% block content %}
<h1>{%trans "User groups" %}</h1> <h1>{%trans "User groups" %}</h1>