🎨 - refactor: translations

Author: Xaohs

backend/src/openarchiefbeheer/conf/locale/en/LC_MESSAGES/django.po

@@ -37,15 +37,11 @@ msgid "Co-reviewers list"
 msgstr ""
 
 #: openarchiefbeheer/accounts/api/views.py:33
-#, fuzzy
-#| msgid ""
-#| "The chosen user does not have the permission of reviewing a destruction "
-#| "list."
 msgid ""
 "List all the users that have the permission to co-review draft destruction "
 "lists."
 msgstr ""
-"De geselecteerde gebruiker heeft geen rechten om een vernietigingslijst te "
+"Lijst van alle gebruikers die de rechten hebben om concept-vernietigingslijsten mede te "
 "beoordelen."
 
 #: openarchiefbeheer/accounts/api/views.py:48
@@ -135,16 +131,12 @@ msgid "You cannot create or update a user with more permissions than yourself."
 msgstr "U kunt een gebruiker niet meer rechten geven dan u zelf heeft."
 
 #: openarchiefbeheer/api/authentication/serializers.py:8
-#, fuzzy
-#| msgid "username"
 msgid "Username"
 msgstr "gebruikersnaam"
 
 #: openarchiefbeheer/api/authentication/serializers.py:10
-#, fuzzy
-#| msgid "Change password"
 msgid "Password"
-msgstr "Wachtwoord wijzigen"
+msgstr "Wachtwoord"
 
 #: openarchiefbeheer/api/authentication/serializers.py:28
 msgid "Unable to log in with provided credentials."
@@ -267,16 +259,12 @@ msgid "Which service to use to query the Selectielijst API."
 msgstr ""
 
 #: openarchiefbeheer/config/models.py:87
-#, fuzzy
-#| msgid "Administration"
 msgid "API configuration"
-msgstr "Beheer"
+msgstr "API-configuratie"
 
 #: openarchiefbeheer/config/models.py:88
-#, fuzzy
-#| msgid "Administration"
 msgid "API configurations"
-msgstr "Beheer"
+msgstr "API-configuraties"
 
 #: openarchiefbeheer/destruction/api/filtersets.py:27
 msgid ""
@@ -340,10 +328,8 @@ msgstr ""
 "Je bent niet toegestaan om de geplande vernietiging van de lijst te stoppen."
 
 #: openarchiefbeheer/destruction/api/permissions.py:100
-#, fuzzy
-#| msgid "You are not allowed to review a destruction list."
 msgid "You are not a main reviewer."
-msgstr "Je bent niet toegestaan om een vernietigingslijst te beoordelen."
+msgstr "Je bent geen hoofd beoordelaar."
 
 #: openarchiefbeheer/destruction/api/serializers.py:54
 msgid ""
@@ -359,21 +345,14 @@ msgid "The author of a list cannot also be a reviewer."
 msgstr "De auteur van een lijst kan niet tevens een beoordelaar zijn."
 
 #: openarchiefbeheer/destruction/api/serializers.py:81
-#, fuzzy
-#| msgid ""
-#| "The chosen user does not have the permission of reviewing a destruction "
-#| "list."
 msgid ""
 "The chosen user does not have the permission to co-review a destruction list."
 msgstr ""
-"De geselecteerde gebruiker heeft geen rechten om een vernietigingslijst te "
-"beoordelen."
+"De geselecteerde gebruiker heeft geen rechten om een vernietigingslijst gezamelijk te beoordelen."
 
 #: openarchiefbeheer/destruction/api/serializers.py:93
-#, fuzzy
-#| msgid "The author of a list cannot also be a reviewer."
 msgid "The main reviewer cannot also be a co-reviewer."
-msgstr "De auteur van een lijst kan niet tevens een beoordelaar zijn."
+msgstr "De hoofdbeoordelaar kan niet tevens een medebeoordelaar zijn."
 
 #: openarchiefbeheer/destruction/api/serializers.py:123
 #: openarchiefbeheer/destruction/tests/endpoints/test_co_reviewers.py:326

backend/src/openarchiefbeheer/conf/locale/nl/LC_MESSAGES/django.po

@@ -127,10 +127,11 @@ def test_abort_list_destruction(self):
         self.assertEqual(
             message,
             _(
-                'User "%(record_manager)s" with the role of "" has aborted the destruction of destruction list "%(list_name)s" '
+                'User "%(record_manager)s" with the role of "%(role)s" has aborted the destruction of destruction list "%(list_name)s" '
                 'with reason: "%(comment)s".'
             )
             % {
+                "role": "",
                 "list_name": "A test list",
                 "record_manager": str(record_manager),
                 "comment": "PANIC! ABORT!",

backend/src/openarchiefbeheer/destruction/tests/endpoints/test_abort_destruction.py

@@ -238,9 +238,9 @@ def test_audit_log(self):
         self.assertEqual(
             data[0]["message"],
             _(
-                'User "%(user)s" with the role of "" has reassigned destruction list "%(list_name)s".'
+                'User "%(user)s" with the role of "%(role)s" has reassigned destruction list "%(list_name)s".'
             )
-            % {"list_name": "Test audittrail", "user": record_manager},
+            % {"list_name": "Test audittrail", "user": record_manager, "role": ""},
         )
         self.assertEqual(
             data[0]["extra_data"]["assignee"]["user"],

backend/src/openarchiefbeheer/destruction/tests/endpoints/test_reviewresponse.py

@@ -567,11 +567,12 @@ def test_mark_as_final(self):
         self.assertEqual(
             message.strip("\n"),
             _(
-                'User "%(user)s" with the role of "" has made destruction list "%(list_name)s" final and '
+                'User "%(user)s" with the role of "%(role)s" has made destruction list "%(list_name)s" final and '
                 "assigned it to the archivist %(archivist)s."
             )
             % {
                 "user": record_manager,
+                "role": "",
                 "list_name": "A test list",
                 "record_manager": "record_manager",
                 "archivist": "archivist",

backend/src/openarchiefbeheer/destruction/tests/test_endpoints.py

@@ -112,9 +112,9 @@ def test_create_destruction_list(self):
         self.assertEqual(
             message,
             _(
-                'User "%(author)s" with the role of "" has created destruction list "%(list_name)s".'
+                'User "%(author)s" with the role of "%(role)s" has created destruction list "%(list_name)s".'
             )
-            % {"list_name": "A test list", "author": "Jeffrey Jones (record_manager)"},
+            % {"list_name": "A test list", "author": "Jeffrey Jones (record_manager)", "role": ""},
         )
 
     def test_zaak_already_included_in_other_list(self):
@@ -267,9 +267,9 @@ def test_full_list_update(self):
         self.assertEqual(
             message,
             _(
-                'User "%(user)s" with the role of "" has updated destruction list "%(list_name)s".'
+                'User "%(user)s" with the role of "%(role)s" has updated destruction list "%(list_name)s".'
             )
-            % {"list_name": "An updated test list", "user": record_manager},
+            % {"list_name": "An updated test list", "user": record_manager, "role": ""},
         )
 
     def test_partial_list_update(self):

backend/src/openarchiefbeheer/destruction/tests/test_serializers.py

@@ -10,36 +10,27 @@
     DestructionListReview,
     ReviewDecisionChoices,
 )
+from django.db.models import Model
 
-
-def _create_log_destruction_list(
-    destruction_list: DestructionList,
-    event: str,
-    extra_data: dict | None = None,
-    user: User | None = None,
-) -> TimelineLog:
-    serialized_user = UserSerializer(user).data if user else {}
-    user_groups = [group.name for group in user.groups.all()] if user else []
-
-    combined_extra_data = {
-        **(extra_data or {}),
-        "user": serialized_user,
-        "groups": user_groups,
-    }
+def _create_log(model: Model, event: str, extra_data: dict | None = None, user: User | None = None) -> TimelineLog:
+    if user:
+        serializer = UserSerializer(user)
+        user_groups = [group.name for group in user.groups.all()] 
+        extra_data.update({"user": serializer.data, "user_groups": user_groups})
 
     return TimelineLog.objects.create(
-        content_object=destruction_list,
+        content_object=model,
         template=f"logging/{event}.txt",
-        extra_data=combined_extra_data,
+        extra_data=extra_data or {},
         user=user,
     )
 
 
 def destruction_list_created(
     destruction_list: DestructionList, author: User, reviewer: User
 ) -> None:
-    _create_log_destruction_list(
-        destruction_list=destruction_list,
+    _create_log(
+        model=destruction_list,
         event="destruction_list_created",
         user=author,
         extra_data={
@@ -55,8 +46,8 @@ def destruction_list_created(
 
 
 def destruction_list_updated(destruction_list: DestructionList, user: User) -> None:
-    _create_log_destruction_list(
-        destruction_list=destruction_list, event="destruction_list_updated", user=user
+    _create_log(
+        model=destruction_list, event="destruction_list_updated", user=user
     )
 
 
@@ -66,8 +57,8 @@ def destruction_list_reassigned(
     comment: str,
     user: User,
 ) -> None:
-    _create_log_destruction_list(
-        destruction_list=destruction_list,
+    _create_log(
+        model=destruction_list,
         event="destruction_list_reassigned",
         user=user,
         extra_data={
@@ -91,8 +82,8 @@ def destruction_list_co_reviewers_added(
     comment: str,
     user: User,
 ):
-    _create_log_destruction_list(
-        destruction_list=destruction_list,
+    _create_log(
+        model=destruction_list,
         event="destruction_list_co_reviewers_added",
         user=user,
         extra_data={
@@ -113,8 +104,8 @@ def destruction_list_co_reviewers_added(
 def destruction_list_reviewed(
     destruction_list: DestructionList, review: DestructionListReview, user: User
 ) -> None:
-    _create_log_destruction_list(
-        destruction_list=destruction_list,
+    _create_log(
+        model=destruction_list,
         event="destruction_list_reviewed",
         user=user,
         extra_data={"approved": review.decision == ReviewDecisionChoices.accepted},
@@ -127,8 +118,8 @@ def destruction_list_finalized(
     archivist: User,
     record_manager: User,
 ) -> None:
-    _create_log_destruction_list(
-        destruction_list=destruction_list,
+    _create_log(
+        model=destruction_list,
         event="destruction_list_finalized",
         user=record_manager,
         extra_data={
@@ -149,8 +140,8 @@ def destruction_list_aborted(
     comment: str,
     record_manager: User,
 ):
-    _create_log_destruction_list(
-        destruction_list=destruction_list,
+    _create_log(
+        model=destruction_list,
         event="destruction_list_aborted",
         user=record_manager,
         extra_data={

backend/src/openarchiefbeheer/logging/logevent.py

@@ -1,3 +1,3 @@
-{% load i18n %}{% blocktranslate trimmed with list_name=log.content_object.name role=log.extra_data.groups.0 record_manager=log.user comment=log.extra_data.comment %}
-User "{{ record_manager }}" with the role of "{{ role }}" has aborted the destruction of destruction list "{{ list_name }}" with reason: "{{ comment }}".
+{% load i18n %}{% blocktranslate trimmed with list_name=log.content_object.name groups=log.extra_data.user_groups|join:", " n_groups=log.extra_data.user_groups|length record_manager=log.user comment=log.extra_data.comment %}
+User "{{ record_manager }}" (member of group{{ n_groups|pluralize }} "{{ groups }}") has aborted the destruction of destruction list "{{ list_name }}" with reason: "{{ comment }}".
 {% endblocktranslate %}

backend/src/openarchiefbeheer/logging/templates/logging/destruction_list_aborted.txt

@@ -1,21 +1,26 @@
-{% load i18n %}{% with added_co_reviewers=log.extra_data.added_co_reviewers|join:", "  %}{% with removed_co_reviewers=log.extra_data.removed_co_reviewers|join:", "  %}
+{% load i18n %}
+{% with added_co_reviewers=log.extra_data.added_co_reviewers|join:", " %}
+{% with removed_co_reviewers=log.extra_data.removed_co_reviewers|join:", " %}
+{% with groups=log.extra_data.user_groups|join:", " n_groups=log.extra_data.user_groups|length %}
+  
 {% if log.extra_data.partial %}
-{% blocktranslate trimmed with role=log.extra_data.groups.0 list_name=log.content_object.name user=log.user added_co_reviewers=added_co_reviewers %}
-User "{{ user }}" with the role of "{{ role }}" has added these users as co-reviewers to the list "{{ list_name }}": {{ added_co_reviewers }}.
-{% endblocktranslate %}
-{% if removed_co_reviewers %}
-{% blocktranslate trimmed with removed_co_reviewers=removed_co_reviewers %}
-They also removed these co-reviewers: {{ removed_co_reviewers }}.
-{% endblocktranslate %}
-{% endif %}
+    {% blocktranslate trimmed with list_name=log.content_object.name user=log.user added_co_reviewers=added_co_reviewers groups=groups n_groups=n_groups %}
+    User "{{ user }}" (member of group{{ n_groups|pluralize }} "{{ groups }}") has added these users as co-reviewers to the list "{{ list_name }}": {{ added_co_reviewers }}.
+    {% endblocktranslate %}
+    
+    {% if removed_co_reviewers %}
+    {% blocktranslate trimmed with removed_co_reviewers=removed_co_reviewers %}
+    They also removed these co-reviewers: {{ removed_co_reviewers }}.
+    {% endblocktranslate %}
+    {% endif %}
 {% else %}
-{% blocktranslate trimmed with list_name=log.content_object.name role=log.extra_data.groups.0 user=log.user added_co_reviewers=added_co_reviewers %}
-User "{{ user }}" with the role of "{{ role }}" has replaced all the co-reviewers of the list "{{ list_name }}" with: {{ added_co_reviewers }}.
-{% endblocktranslate %}
+    {% blocktranslate trimmed with list_name=log.content_object.name user=log.user added_co_reviewers=added_co_reviewers groups=groups n_groups=n_groups %}
+    User "{{ user }}" (member of group{{ n_groups|pluralize }} "{{ groups }}") has replaced all the co-reviewers of the list "{{ list_name }}" with: {{ added_co_reviewers }}.
+    {% endblocktranslate %}
 {% endif %}
 
 {% blocktranslate trimmed with comment=log.extra_data.comment %}
-They added the comment: {{ comment }}.
+They added the comment: "{{ comment }}".
 {% endblocktranslate %}
-{% endwith %}{% endwith %}
 
+{% endwith %}{% endwith %}{% endwith %}

backend/src/openarchiefbeheer/logging/templates/logging/destruction_list_co_reviewers_added.txt

@@ -1,3 +1,6 @@
-{% load i18n %}{% blocktranslate trimmed with list_name=log.content_object.name role=log.extra_data.groups.0 author=log.user %}
-User "{{ author }}" with the role of "{{ role }}" has created destruction list "{{ list_name }}".
-{% endblocktranslate %}
+{% load i18n %}
+{% with groups=log.extra_data.user_groups|join:", " n_groups=log.extra_data.user_groups|length %}
+{% blocktranslate trimmed with list_name=log.content_object.name groups=groups n_groups=n_groups author=log.user %}
+User "{{ author }}" (member of group{{ n_groups|pluralize }} "{{ groups }}") has created destruction list "{{ list_name }}".
+{% endblocktranslate %}
+{% endwith %}

backend/src/openarchiefbeheer/logging/templates/logging/destruction_list_created.txt

@@ -1,4 +1,6 @@
 {% load i18n %}
-{% blocktranslate trimmed with list_name=log.content_object.name role=log.extra_data.groups.0 user=log.user record_manager=log.user.username archivist=log.extra_data.archivist.username %}
-    User "{{ user }}" with the role of "{{ role }}" has made destruction list "{{ list_name }}" final and assigned it to the archivist {{ archivist }}.
+{% with groups=log.extra_data.user_groups|join:", " n_groups=log.extra_data.user_groups|length %}
+{% blocktranslate trimmed with list_name=log.content_object.name groups=groups n_groups=n_groups user=log.user record_manager=log.user.username archivist=log.extra_data.archivist.username %}
+User "{{ user }}" (member of group{{ n_groups|pluralize }} "{{ groups }}") has made destruction list "{{ list_name }}" final and assigned it to the archivist "{{ archivist }}".
 {% endblocktranslate %}
+{% endwith %}

backend/src/openarchiefbeheer/logging/templates/logging/destruction_list_finalized.txt

@@ -1,3 +1,6 @@
-{% load i18n %}{% blocktranslate trimmed with timestamp=log.timestamp|date:"c" list_name=log.content_object.name role=log.extra_data.groups.0 user=log.user %}
-    User "{{ user }}" with the role of "{{ role }}" has reassigned destruction list "{{ list_name }}".
-{% endblocktranslate %}
+{% load i18n %}
+{% with groups=log.extra_data.user_groups|join:", " n_groups=log.extra_data.user_groups|length %}
+{% blocktranslate trimmed with timestamp=log.timestamp|date:"c" list_name=log.content_object.name groups=groups n_groups=n_groups user=log.user %}
+User "{{ user }}" (member of group{{ n_groups|pluralize }} "{{ groups }}") has reassigned destruction list "{{ list_name }}" on "{{ timestamp }}".
+{% endblocktranslate %}
+{% endwith %}

backend/src/openarchiefbeheer/logging/templates/logging/destruction_list_reassigned.txt

@@ -1,2 +1,11 @@
-{% load i18n %}{% blocktranslate trimmed with timestamp=log.timestamp|date:"c" list_name=log.content_object.name role=log.extra_data.groups.0 user=log.user %}
-   User "{{ user }}" with the role of "{{ role }}" has reviewed the list "{{ list_name }}". {% endblocktranslate %}{% if log.extra_data.approved %}{% translate " The destruction list was approved." %}{% else %}{% translate " The destruction list was rejected." %}{% endif %}
+{% load i18n %}
+{% with groups=log.extra_data.user_groups|join:", " n_groups=log.extra_data.user_groups|length %}
+{% blocktranslate trimmed with timestamp=log.timestamp|date:"c" list_name=log.content_object.name groups=groups n_groups=n_groups user=log.user approved=log.extra_data.approved %}
+User "{{ user }}" (member of group{{ n_groups|pluralize }} "{{ groups }}") has reviewed the list "{{ list_name }}" on "{{ timestamp }}".
+{% endblocktranslate %}
+{% if approved %}
+    {% translate "The destruction list was approved." %}
+{% else %}
+    {% translate "The destruction list was rejected." %}
+{% endif %}
+{% endwith %}

backend/src/openarchiefbeheer/logging/templates/logging/destruction_list_reviewed.txt

@@ -1,3 +1,6 @@
-{% load i18n %}{% blocktranslate trimmed with list_name=log.content_object.name role=log.extra_data.groups.0 user=log.user %}
-    User "{{ user }}" with the role of "{{ role }}" has updated destruction list "{{ list_name }}".
-{% endblocktranslate %}
+{% load i18n %}
+{% with groups=log.extra_data.user_groups|join:", " n_groups=log.extra_data.user_groups|length %}
+{% blocktranslate trimmed with list_name=log.content_object.name groups=groups n_groups=n_groups user=log.user %}
+User "{{ user }}" (member of group{{ n_groups|pluralize }} "{{ groups }}") has updated destruction list "{{ list_name }}".
+{% endblocktranslate %}
+{% endwith %}