diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo index 88587ffd0..19262fae9 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 8b66578b2..ff59ff9ff 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-19 23:01+0100\n" +"POT-Creation-Date: 2012-11-19 23:20+0100\n" "PO-Revision-Date: 2012-07-28 11:07+0200\n" "Last-Translator: Emanuel Schuetze \n" "Language-Team: support@openslides.de\n" @@ -1762,8 +1762,8 @@ msgstr "Gast" #: participant/models.py:44 participant/templates/participant/overview.html:30 #: participant/templates/participant/overview.html:68 -msgid "Detail" -msgstr "Detail" +msgid "Structure level" +msgstr "Gliederungsebene" #: participant/models.py:45 msgid "Will be shown after the name." @@ -2296,8 +2296,8 @@ msgid "" "Get professional " "support for OpenSlides." msgstr "" -"Nutzen Sie unseren professionellen " -"Support für OpenSlides." +"Nutzen Sie unseren professionellen Support für OpenSlides." #: utils/pdf.py:227 #, python-format diff --git a/openslides/motion/views.py b/openslides/motion/views.py index 8f564d60f..f777ec7cf 100644 --- a/openslides/motion/views.py +++ b/openslides/motion/views.py @@ -615,7 +615,7 @@ def motion_import(request): user.last_name = last_name user.first_name = first_name user.username = gen_username(first_name, last_name) - user.detail = '' + user.structure_level = '' user.committee = '' user.gender = '' user.type = '' diff --git a/openslides/participant/api.py b/openslides/participant/api.py index 5f5bf2b0b..938eacca6 100644 --- a/openslides/participant/api.py +++ b/openslides/participant/api.py @@ -71,7 +71,7 @@ def import_users(csv_file): dialect=dialect)): if line_no: try: - (first_name, last_name, gender, detail, type, committee, comment) = line[:7] + (first_name, last_name, gender, structure_level, type, committee, comment) = line[:7] except ValueError: error_messages.append(_('Ignoring malformed line %d in import file.') % line_no + 1) continue @@ -80,7 +80,7 @@ def import_users(csv_file): user.first_name = first_name user.username = gen_username(first_name, last_name) user.gender = gender - user.detail = detail + user.structure_level = structure_level user.type = type user.committee = committee user.comment = comment diff --git a/openslides/participant/forms.py b/openslides/participant/forms.py index a176e505d..da395680e 100644 --- a/openslides/participant/forms.py +++ b/openslides/participant/forms.py @@ -27,7 +27,7 @@ class UserCreateForm(forms.ModelForm, CssClassMixin): class Meta: model = User - fields = ('first_name', 'last_name', 'is_active', 'groups', 'detail', + fields = ('first_name', 'last_name', 'is_active', 'groups', 'structure_level', 'gender', 'type', 'committee', 'about_me', 'comment', 'default_password') @@ -35,7 +35,7 @@ class UserUpdateForm(UserCreateForm): class Meta: model = User fields = ('username', 'first_name', 'last_name', 'is_active', 'groups', - 'detail', 'gender', 'type', 'committee', 'about_me', 'comment', + 'structure_level', 'gender', 'type', 'committee', 'about_me', 'comment', 'default_password') diff --git a/openslides/participant/models.py b/openslides/participant/models.py index 6f90709f4..68d4034a3 100644 --- a/openslides/participant/models.py +++ b/openslides/participant/models.py @@ -40,8 +40,8 @@ class User(DjangoUser, PersonMixin, Person, SlideMixin): ) django_user = models.OneToOneField(DjangoUser, editable=False, parent_link=True) - detail = models.CharField( - max_length=100, blank=True, default='', verbose_name=_("Detail"), + structure_level = models.CharField( + max_length=100, blank=True, default='', verbose_name=_("Structure level"), help_text=_('Will be shown after the name.')) gender = models.CharField( max_length=50, choices=GENDER_CHOICES, blank=True, @@ -67,10 +67,10 @@ class User(DjangoUser, PersonMixin, Person, SlideMixin): return self.get_full_name() or self.username def get_name_suffix(self): - return self.detail + return self.structure_level def set_name_suffix(self, value): - self.detail = value + self.structure_level = value name_suffix = property(get_name_suffix, set_name_suffix) diff --git a/openslides/participant/templates/participant/overview.html b/openslides/participant/templates/participant/overview.html index 4a9aa133b..f61afe04f 100644 --- a/openslides/participant/templates/participant/overview.html +++ b/openslides/participant/templates/participant/overview.html @@ -26,11 +26,11 @@ - + + {% for level in structure_levels %} + {% endfor %}