From 0fbb7dced326d909c625c59d61d0df0570f4a769 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Mon, 19 Nov 2012 23:30:09 +0100 Subject: [PATCH] Rename participant field 'details' to 'structure level' (Gliederungsebene). (DB rebuild required!) --- openslides/locale/de/LC_MESSAGES/django.mo | Bin 35509 -> 35528 bytes openslides/locale/de/LC_MESSAGES/django.po | 10 +++++----- openslides/motion/views.py | 2 +- openslides/participant/api.py | 4 ++-- openslides/participant/forms.py | 4 ++-- openslides/participant/models.py | 8 ++++---- .../templates/participant/overview.html | 14 +++++++------- openslides/participant/tests.py | 2 +- openslides/participant/views.py | 16 ++++++++-------- 9 files changed, 30 insertions(+), 30 deletions(-) diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo index 88587ffd0b15e7d890ddbbe6888b6aa6d460d1e6..19262fae97466696415dad5df38b58c6ab7e9551 100644 GIT binary patch delta 9017 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 WLD95Hg-;cXE|^qM{@(1L1OEp)em6t_ delta 8996 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 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 %}