Skip to content

Commit

Permalink
Merge pull request #130 from molgen/progress
Browse files Browse the repository at this point in the history
Cleanup personal
  • Loading branch information
donald authored Feb 9, 2025
2 parents 46f169f + 80e672a commit 3ed605d
Show file tree
Hide file tree
Showing 9 changed files with 233 additions and 201 deletions.
142 changes: 67 additions & 75 deletions locale/de/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-02-06 17:08+0100\n"
"POT-Creation-Date: 2025-02-09 17:31+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -56,7 +56,6 @@ msgid "content"
msgstr "Inhalt"

#: mpicms/base/blocks.py:56 mpicms/base/blocks.py:59 mpicms/base/models.py:74
#: mpicms/templates/personal/list.html:92
#: venv0/lib/python3.7/site-packages/wagtailvideos/templates/wagtailvideos/videos/usage.html:16
msgid "Title"
msgstr "Titel"
Expand All @@ -83,16 +82,16 @@ msgstr "Generiere Inhaltsverzeichnis"
msgid "Page not available in %s"
msgstr "Seite auf %s nicht vorhanden"

#: mpicms/base/mixins.py:94 mpicms/personal/wagtail_hooks.py:99
#: mpicms/base/mixins.py:94 mpicms/personal/wagtail_hooks.py:98
msgid "Contacts"
msgstr "Kontakte"

#: mpicms/base/mixins.py:95
msgid "Sidebar Content"
msgstr "Inhalt der Seitenleiste"

#: mpicms/base/models.py:46 mpicms/personal/models.py:68
#: mpicms/personal/models.py:120 mpicms/publications/models.py:26
#: mpicms/base/models.py:46 mpicms/personal/models.py:27
#: mpicms/personal/models.py:95 mpicms/publications/models.py:26
#: venv0/lib/python3.7/site-packages/wagtailvideos/models.py:84
msgid "title"
msgstr "Titel"
Expand Down Expand Up @@ -190,7 +189,7 @@ msgstr "Anfangszeit"
msgid "end time"
msgstr "Endzeit"

#: mpicms/events/models.py:22 mpicms/templates/personal/list.html:97
#: mpicms/events/models.py:22 mpicms/templates/personal/list.html:95
msgid "Room"
msgstr "Raum"

Expand Down Expand Up @@ -234,106 +233,82 @@ msgstr "Neuigkeit"
msgid "news entries"
msgstr "Neuigkeiten"

#: mpicms/personal/models.py:25 mpicms/publications/models.py:27
msgid "groups"
msgstr "Gruppen"

#: mpicms/personal/models.py:31
msgid "group"
msgstr "Gruppe"

#: mpicms/personal/models.py:44
msgid "positions"
msgstr "Positionen"

#: mpicms/personal/models.py:50
msgid "position"
msgstr "Position"

#: mpicms/personal/models.py:83
#: mpicms/personal/models.py:45
msgid "status"
msgstr ""
msgstr "Status"

#: mpicms/personal/models.py:97
#: mpicms/personal/models.py:60
msgid "special function"
msgstr ""
msgstr "Sonderfunktion"

#: mpicms/personal/models.py:121
#: mpicms/personal/models.py:74
msgid "name"
msgstr "Name"

#: mpicms/personal/models.py:96
msgid "first name"
msgstr "Vorname"

#: mpicms/personal/models.py:122
#: mpicms/personal/models.py:97
msgid "last name"
msgstr "Nachname"

#: mpicms/personal/models.py:123
#: mpicms/personal/models.py:98
msgid "academic_suffix"
msgstr ""

#: mpicms/personal/models.py:124
#: mpicms/personal/models.py:99
msgid "email"
msgstr "Email-Adresse"

#: mpicms/personal/models.py:125
#: mpicms/personal/models.py:100
msgid "phone number"
msgstr "Telefonnummer"

#: mpicms/personal/models.py:126
#: mpicms/personal/models.py:101
msgid "room"
msgstr "Raum"

#: mpicms/personal/models.py:127
#: mpicms/personal/models.py:102
msgid "is active"
msgstr "ist aktiv"

#: mpicms/personal/models.py:129 mpicms/personal/models.py:191
msgid "priority"
msgstr "Priorität"

#: mpicms/personal/models.py:130
msgid "Priority from 0-999 to determine the sorting order."
msgstr "Priorität von 0-999 zur Bestimmung der Reihenfolge."

#: mpicms/personal/models.py:132
#: mpicms/personal/models.py:104
msgid "special functions"
msgstr ""

#: mpicms/personal/models.py:188
msgid "slug"
msgstr "Kürzel"
msgstr "Sonderfunktionen"

#: mpicms/personal/models.py:189
msgid "name"
msgstr "Name"
#: mpicms/personal/models.py:105
msgid "positions"
msgstr "Positionen"

#: mpicms/personal/models.py:192
msgid "Priority from 0-99 to determine the sorting order."
msgstr "Priorität von 0-99 zur Bestimmung der Reihenfolge."
#: mpicms/personal/models.py:106 mpicms/publications/models.py:27
msgid "groups"
msgstr "Gruppen"

#: mpicms/personal/models.py:220
#: mpicms/personal/models.py:167
msgid "valid"
msgstr ""
msgstr "gültig"

#: mpicms/personal/wagtail_hooks.py:40
msgid "Persons"
msgstr "Personen"

#: mpicms/personal/wagtail_hooks.py:52 mpicms/personal/wagtail_hooks.py:69
#: mpicms/templates/personal/list.html:98
#: mpicms/personal/wagtail_hooks.py:52 mpicms/personal/wagtail_hooks.py:68
#: mpicms/templates/personal/list.html:96
#: mpicms/templates/wagtailusers/users/list.html:28
msgid "Groups"
msgstr "Gruppen"

#: mpicms/personal/wagtail_hooks.py:57 mpicms/personal/wagtail_hooks.py:76
#: mpicms/templates/personal/list.html:99
#: mpicms/personal/wagtail_hooks.py:56 mpicms/personal/wagtail_hooks.py:75
#: mpicms/templates/personal/list.html:97
msgid "Positions"
msgstr "Positionen"

#: mpicms/personal/wagtail_hooks.py:88 mpicms/templates/personal/list.html:100
#: mpicms/personal/wagtail_hooks.py:87 mpicms/templates/personal/list.html:98
msgid "Special Functions"
msgstr "Sonderfunktionen"

#: mpicms/personal/wagtail_hooks.py:94
#: mpicms/personal/wagtail_hooks.py:93
msgid "Written Consents"
msgstr "Einwilligungen"

Expand Down Expand Up @@ -466,19 +441,17 @@ msgstr "Position"
msgid "Special Function"
msgstr "Sonderfunktion"

#: mpicms/templates/personal/list.html:93
msgid "First Name"
msgstr "Vorname"

#: mpicms/templates/personal/list.html:94
msgid "Last Name"
#: mpicms/templates/personal/list.html:92
#: mpicms/templates/wagtailusers/users/list.html:8
#: mpicms/templates/wagtailusers/users/list.html:12
msgid "Name"
msgstr "Nachname"

#: mpicms/templates/personal/list.html:95
#: mpicms/templates/personal/list.html:93
msgid "Email"
msgstr "Email-Adresse"

#: mpicms/templates/personal/list.html:96
#: mpicms/templates/personal/list.html:94
msgid "Phone"
msgstr "Telefon"

Expand Down Expand Up @@ -516,12 +489,7 @@ msgstr "Nicht Abonniert"

#: mpicms/templates/wagtailusers/users/index.html:5
msgid "Users"
msgstr ""

#: mpicms/templates/wagtailusers/users/list.html:8
#: mpicms/templates/wagtailusers/users/list.html:12
msgid "Name"
msgstr "Nachname"
msgstr "Benutzer"

#: mpicms/templates/wagtailusers/users/list.html:19
#: mpicms/templates/wagtailusers/users/list.html:23
Expand Down Expand Up @@ -2220,5 +2188,29 @@ msgstr ""
msgid "Edit this video"
msgstr ""

#~ msgid "group"
#~ msgstr "Gruppe"

#~ msgid "position"
#~ msgstr "Position"

#~ msgid "priority"
#~ msgstr "Priorität"

#~ msgid "Priority from 0-999 to determine the sorting order."
#~ msgstr "Priorität von 0-999 zur Bestimmung der Reihenfolge."

#~ msgid "slug"
#~ msgstr "Kürzel"

#~ msgid "Priority from 0-99 to determine the sorting order."
#~ msgstr "Priorität von 0-99 zur Bestimmung der Reihenfolge."

#~ msgid "First Name"
#~ msgstr "Vorname"

#~ msgid "Last Name"
#~ msgstr "Nachname"

#~ msgid "Filter by group"
#~ msgstr "Gruppen"
29 changes: 29 additions & 0 deletions mpicms/personal/migrations/0028_auto_20250208_2003.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Generated by Django 3.1.7 on 2025-02-08 19:03

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('personal', '0027_auto_20250115_1509'),
]

operations = [
migrations.AlterModelOptions(
name='group',
options={'ordering': ['name'], 'verbose_name': 'Group', 'verbose_name_plural': 'Groups'},
),
migrations.AlterModelOptions(
name='position',
options={'ordering': ['title']},
),
migrations.AlterModelOptions(
name='specialfunction',
options={'ordering': ['title']},
),
migrations.AlterModelOptions(
name='status',
options={'ordering': ['title'], 'verbose_name_plural': 'status'},
),
]
22 changes: 22 additions & 0 deletions mpicms/personal/migrations/0029_auto_20250209_1010.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Generated by Django 3.1.7 on 2025-02-09 09:10

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('personal', '0028_auto_20250208_2003'),
]

operations = [
migrations.AddField(
model_name='contact',
name='positions',
field=models.ManyToManyField(blank=True, related_name='contacts', to='personal.Position', verbose_name='positions'),
),
migrations.RunSQL("INSERT INTO personal_contact_positions(id, contact_id, position_id) SELECT id, contact_id, position_id FROM personal_contactpositions"),
migrations.DeleteModel(
name='ContactPositions',
),
]
22 changes: 22 additions & 0 deletions mpicms/personal/migrations/0030_auto_20250209_1143.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Generated by Django 3.1.7 on 2025-02-09 10:43

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('personal', '0029_auto_20250209_1010'),
]

operations = [
migrations.AddField(
model_name='contact',
name='groups',
field=models.ManyToManyField(blank=True, related_name='contacts', to='personal.Group', verbose_name='groups'),
),
migrations.RunSQL("INSERT INTO personal_contact_groups(id, contact_id, group_id) SELECT id, contact_id, group_id FROM personal_contactgroups"),
migrations.DeleteModel(
name='ContactGroups',
),
]
25 changes: 25 additions & 0 deletions mpicms/personal/migrations/0031_auto_20250209_1358.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Generated by Django 3.1.7 on 2025-02-09 12:58

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('personal', '0030_auto_20250209_1143'),
]

operations = [
migrations.RemoveField(
model_name='contact',
name='priority',
),
migrations.RemoveField(
model_name='group',
name='priority',
),
migrations.RemoveField(
model_name='group',
name='slug',
),
]
Loading

0 comments on commit 3ed605d

Please sign in to comment.