From 1d6a0bee4e3aeb2c1028da37e3516920d399e56e Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Mon, 14 May 2012 23:04:00 +0200
Subject: [PATCH] #174: Change form field 'groups' to 'user groups'.

---
 openslides/locale/de/LC_MESSAGES/django.mo    | Bin 31802 -> 31807 bytes
 openslides/locale/de/LC_MESSAGES/django.po    |  12 +++++++-----
 openslides/participant/forms.py               |   4 +++-
 .../templates/participant/group_overview.html |   2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo
index 9c072a7bce56b12524fab5127d76fb171814b45c..fd215a07f82ede770f68914d73704e0e20b40e8d 100644
GIT binary patch
delta 6487
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

delta 6481
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

diff --git a/openslides/locale/de/LC_MESSAGES/django.po b/openslides/locale/de/LC_MESSAGES/django.po
index 59f5cb72f..94517f91b 100644
--- a/openslides/locale/de/LC_MESSAGES/django.po
+++ b/openslides/locale/de/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenSlides 1.x\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"
 "Last-Translator: Emanuel Schuetze <emanuel@intevation.de>\n"
 "Language-Team: German\n"
@@ -1071,7 +1071,8 @@ msgstr "Teilnehmer/in vorschlagen"
 
 #: assignment/forms.py:39
 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
 msgid "Title for PDF document (all elections)"
@@ -1516,6 +1517,10 @@ msgstr "Vorname"
 msgid "Last name"
 msgstr "Nachname"
 
+#: participant/forms.py:62
+msgid "Persmissions"
+msgstr "Rechte"
+
 #: participant/forms.py:82
 msgid "For existing applications"
 msgstr "Bei existierenden Anträgen"
@@ -1820,9 +1825,6 @@ msgid "Edit user group"
 msgstr "Benutzerrolle bearbeiten"
 
 #: participant/templates/participant/group_overview.html:6
-msgid "Groups"
-msgstr "Gruppen"
-
 #: participant/templates/participant/group_overview.html:9
 msgid "User groups"
 msgstr "Benutzerrollen"
diff --git a/openslides/participant/forms.py b/openslides/participant/forms.py
index 016e114a0..e83036bc5 100644
--- a/openslides/participant/forms.py
+++ b/openslides/participant/forms.py
@@ -32,6 +32,7 @@ USER_APPLICATION_IMPORT_OPTIONS = [
 class UserNewForm(ModelForm, CssClassMixin):
     first_name = CharField(label=_("First name"))
     last_name = CharField(label=_("Last name"))
+    groups = ModelMultipleChoiceField(queryset=Group.objects.all(), label=_("User groups"), required=False)
 
     class Meta:
         model = User
@@ -41,6 +42,7 @@ class UserNewForm(ModelForm, CssClassMixin):
 class UserEditForm(ModelForm, CssClassMixin):
     first_name = CharField(label=_("First name"))
     last_name = CharField(label=_("Last name"))
+    groups = ModelMultipleChoiceField(queryset=Group.objects.all(), label=_("User groups"), required=False)
 
     class Meta:
         model = User
@@ -59,7 +61,7 @@ class ProfileForm(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):
         super(GroupForm, self).__init__(*args, **kwargs)
diff --git a/openslides/participant/templates/participant/group_overview.html b/openslides/participant/templates/participant/group_overview.html
index e355ccc9a..66d9153da 100644
--- a/openslides/participant/templates/participant/group_overview.html
+++ b/openslides/participant/templates/participant/group_overview.html
@@ -3,7 +3,7 @@
 {% load i18n %}
 {% load staticfiles %}
 
-{% block title %}{{ block.super }} - {%trans "Groups" %}{% endblock %}
+{% block title %}{{ block.super }} - {%trans "User groups" %}{% endblock %}
 
 {% block content %}
     <h1>{%trans "User groups" %}</h1>