diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo index 52ad807eb..f089d3c78 100644 Binary files a/openslides/locale/de/LC_MESSAGES/django.mo and b/openslides/locale/de/LC_MESSAGES/django.mo differ diff --git a/openslides/locale/de/LC_MESSAGES/django.po b/openslides/locale/de/LC_MESSAGES/django.po index b5e53225d..ea2c90f44 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-11-03 08:56+0100\n" +"POT-Creation-Date: 2012-11-03 09:32+0100\n" "PO-Revision-Date: 2012-07-28 11:07+0200\n" "Last-Translator: Emanuel Schuetze \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" %}