Skip to content

Commit 7d31da4

Browse files
Xaohssvenvandescheur
authored andcommitted
🎨 - refactor: translations
1 parent 5e1cc0b commit 7d31da4

14 files changed

+93
-1873
lines changed

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

-1,777
This file was deleted.

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

+7-28
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,11 @@ msgid "Co-reviewers list"
3737
msgstr ""
3838

3939
#: openarchiefbeheer/accounts/api/views.py:33
40-
#, fuzzy
41-
#| msgid ""
42-
#| "The chosen user does not have the permission of reviewing a destruction "
43-
#| "list."
4440
msgid ""
4541
"List all the users that have the permission to co-review draft destruction "
4642
"lists."
4743
msgstr ""
48-
"De geselecteerde gebruiker heeft geen rechten om een vernietigingslijst te "
44+
"Lijst van alle gebruikers die de rechten hebben om concept-vernietigingslijsten mede te "
4945
"beoordelen."
5046

5147
#: openarchiefbeheer/accounts/api/views.py:48
@@ -135,16 +131,12 @@ msgid "You cannot create or update a user with more permissions than yourself."
135131
msgstr "U kunt een gebruiker niet meer rechten geven dan u zelf heeft."
136132

137133
#: openarchiefbeheer/api/authentication/serializers.py:8
138-
#, fuzzy
139-
#| msgid "username"
140134
msgid "Username"
141135
msgstr "gebruikersnaam"
142136

143137
#: openarchiefbeheer/api/authentication/serializers.py:10
144-
#, fuzzy
145-
#| msgid "Change password"
146138
msgid "Password"
147-
msgstr "Wachtwoord wijzigen"
139+
msgstr "Wachtwoord"
148140

149141
#: openarchiefbeheer/api/authentication/serializers.py:28
150142
msgid "Unable to log in with provided credentials."
@@ -267,16 +259,12 @@ msgid "Which service to use to query the Selectielijst API."
267259
msgstr ""
268260

269261
#: openarchiefbeheer/config/models.py:87
270-
#, fuzzy
271-
#| msgid "Administration"
272262
msgid "API configuration"
273-
msgstr "Beheer"
263+
msgstr "API-configuratie"
274264

275265
#: openarchiefbeheer/config/models.py:88
276-
#, fuzzy
277-
#| msgid "Administration"
278266
msgid "API configurations"
279-
msgstr "Beheer"
267+
msgstr "API-configuraties"
280268

281269
#: openarchiefbeheer/destruction/api/filtersets.py:27
282270
msgid ""
@@ -340,10 +328,8 @@ msgstr ""
340328
"Je bent niet toegestaan om de geplande vernietiging van de lijst te stoppen."
341329

342330
#: openarchiefbeheer/destruction/api/permissions.py:100
343-
#, fuzzy
344-
#| msgid "You are not allowed to review a destruction list."
345331
msgid "You are not a main reviewer."
346-
msgstr "Je bent niet toegestaan om een vernietigingslijst te beoordelen."
332+
msgstr "Je bent geen hoofd beoordelaar."
347333

348334
#: openarchiefbeheer/destruction/api/serializers.py:54
349335
msgid ""
@@ -359,21 +345,14 @@ msgid "The author of a list cannot also be a reviewer."
359345
msgstr "De auteur van een lijst kan niet tevens een beoordelaar zijn."
360346

361347
#: openarchiefbeheer/destruction/api/serializers.py:81
362-
#, fuzzy
363-
#| msgid ""
364-
#| "The chosen user does not have the permission of reviewing a destruction "
365-
#| "list."
366348
msgid ""
367349
"The chosen user does not have the permission to co-review a destruction list."
368350
msgstr ""
369-
"De geselecteerde gebruiker heeft geen rechten om een vernietigingslijst te "
370-
"beoordelen."
351+
"De geselecteerde gebruiker heeft geen rechten om een vernietigingslijst gezamelijk te beoordelen."
371352

372353
#: openarchiefbeheer/destruction/api/serializers.py:93
373-
#, fuzzy
374-
#| msgid "The author of a list cannot also be a reviewer."
375354
msgid "The main reviewer cannot also be a co-reviewer."
376-
msgstr "De auteur van een lijst kan niet tevens een beoordelaar zijn."
355+
msgstr "De hoofdbeoordelaar kan niet tevens een medebeoordelaar zijn."
377356

378357
#: openarchiefbeheer/destruction/api/serializers.py:123
379358
#: openarchiefbeheer/destruction/tests/endpoints/test_co_reviewers.py:326

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,11 @@ def test_abort_list_destruction(self):
127127
self.assertEqual(
128128
message,
129129
_(
130-
'User "%(record_manager)s" with the role of "" has aborted the destruction of destruction list "%(list_name)s" '
130+
'User "%(record_manager)s" with the role of "%(role)s" has aborted the destruction of destruction list "%(list_name)s" '
131131
'with reason: "%(comment)s".'
132132
)
133133
% {
134+
"role": "",
134135
"list_name": "A test list",
135136
"record_manager": str(record_manager),
136137
"comment": "PANIC! ABORT!",

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -238,9 +238,9 @@ def test_audit_log(self):
238238
self.assertEqual(
239239
data[0]["message"],
240240
_(
241-
'User "%(user)s" with the role of "" has reassigned destruction list "%(list_name)s".'
241+
'User "%(user)s" with the role of "%(role)s" has reassigned destruction list "%(list_name)s".'
242242
)
243-
% {"list_name": "Test audittrail", "user": record_manager},
243+
% {"list_name": "Test audittrail", "user": record_manager, "role": ""},
244244
)
245245
self.assertEqual(
246246
data[0]["extra_data"]["assignee"]["user"],

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -567,11 +567,12 @@ def test_mark_as_final(self):
567567
self.assertEqual(
568568
message.strip("\n"),
569569
_(
570-
'User "%(user)s" with the role of "" has made destruction list "%(list_name)s" final and '
570+
'User "%(user)s" with the role of "%(role)s" has made destruction list "%(list_name)s" final and '
571571
"assigned it to the archivist %(archivist)s."
572572
)
573573
% {
574574
"user": record_manager,
575+
"role": "",
575576
"list_name": "A test list",
576577
"record_manager": "record_manager",
577578
"archivist": "archivist",

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,9 @@ def test_create_destruction_list(self):
112112
self.assertEqual(
113113
message,
114114
_(
115-
'User "%(author)s" with the role of "" has created destruction list "%(list_name)s".'
115+
'User "%(author)s" with the role of "%(role)s" has created destruction list "%(list_name)s".'
116116
)
117-
% {"list_name": "A test list", "author": "Jeffrey Jones (record_manager)"},
117+
% {"list_name": "A test list", "author": "Jeffrey Jones (record_manager)", "role": ""},
118118
)
119119

120120
def test_zaak_already_included_in_other_list(self):
@@ -267,9 +267,9 @@ def test_full_list_update(self):
267267
self.assertEqual(
268268
message,
269269
_(
270-
'User "%(user)s" with the role of "" has updated destruction list "%(list_name)s".'
270+
'User "%(user)s" with the role of "%(role)s" has updated destruction list "%(list_name)s".'
271271
)
272-
% {"list_name": "An updated test list", "user": record_manager},
272+
% {"list_name": "An updated test list", "user": record_manager, "role": ""},
273273
)
274274

275275
def test_partial_list_update(self):

backend/src/openarchiefbeheer/logging/logevent.py

+22-31
Original file line numberDiff line numberDiff line change
@@ -10,36 +10,27 @@
1010
DestructionListReview,
1111
ReviewDecisionChoices,
1212
)
13+
from django.db.models import Model
1314

14-
15-
def _create_log_destruction_list(
16-
destruction_list: DestructionList,
17-
event: str,
18-
extra_data: dict | None = None,
19-
user: User | None = None,
20-
) -> TimelineLog:
21-
serialized_user = UserSerializer(user).data if user else {}
22-
user_groups = [group.name for group in user.groups.all()] if user else []
23-
24-
combined_extra_data = {
25-
**(extra_data or {}),
26-
"user": serialized_user,
27-
"groups": user_groups,
28-
}
15+
def _create_log(model: Model, event: str, extra_data: dict | None = None, user: User | None = None) -> TimelineLog:
16+
if user:
17+
serializer = UserSerializer(user)
18+
user_groups = [group.name for group in user.groups.all()]
19+
extra_data.update({"user": serializer.data, "user_groups": user_groups})
2920

3021
return TimelineLog.objects.create(
31-
content_object=destruction_list,
22+
content_object=model,
3223
template=f"logging/{event}.txt",
33-
extra_data=combined_extra_data,
24+
extra_data=extra_data or {},
3425
user=user,
3526
)
3627

3728

3829
def destruction_list_created(
3930
destruction_list: DestructionList, author: User, reviewer: User
4031
) -> None:
41-
_create_log_destruction_list(
42-
destruction_list=destruction_list,
32+
_create_log(
33+
model=destruction_list,
4334
event="destruction_list_created",
4435
user=author,
4536
extra_data={
@@ -55,8 +46,8 @@ def destruction_list_created(
5546

5647

5748
def destruction_list_updated(destruction_list: DestructionList, user: User) -> None:
58-
_create_log_destruction_list(
59-
destruction_list=destruction_list, event="destruction_list_updated", user=user
49+
_create_log(
50+
model=destruction_list, event="destruction_list_updated", user=user
6051
)
6152

6253

@@ -66,8 +57,8 @@ def destruction_list_reassigned(
6657
comment: str,
6758
user: User,
6859
) -> None:
69-
_create_log_destruction_list(
70-
destruction_list=destruction_list,
60+
_create_log(
61+
model=destruction_list,
7162
event="destruction_list_reassigned",
7263
user=user,
7364
extra_data={
@@ -91,8 +82,8 @@ def destruction_list_co_reviewers_added(
9182
comment: str,
9283
user: User,
9384
):
94-
_create_log_destruction_list(
95-
destruction_list=destruction_list,
85+
_create_log(
86+
model=destruction_list,
9687
event="destruction_list_co_reviewers_added",
9788
user=user,
9889
extra_data={
@@ -113,8 +104,8 @@ def destruction_list_co_reviewers_added(
113104
def destruction_list_reviewed(
114105
destruction_list: DestructionList, review: DestructionListReview, user: User
115106
) -> None:
116-
_create_log_destruction_list(
117-
destruction_list=destruction_list,
107+
_create_log(
108+
model=destruction_list,
118109
event="destruction_list_reviewed",
119110
user=user,
120111
extra_data={"approved": review.decision == ReviewDecisionChoices.accepted},
@@ -127,8 +118,8 @@ def destruction_list_finalized(
127118
archivist: User,
128119
record_manager: User,
129120
) -> None:
130-
_create_log_destruction_list(
131-
destruction_list=destruction_list,
121+
_create_log(
122+
model=destruction_list,
132123
event="destruction_list_finalized",
133124
user=record_manager,
134125
extra_data={
@@ -149,8 +140,8 @@ def destruction_list_aborted(
149140
comment: str,
150141
record_manager: User,
151142
):
152-
_create_log_destruction_list(
153-
destruction_list=destruction_list,
143+
_create_log(
144+
model=destruction_list,
154145
event="destruction_list_aborted",
155146
user=record_manager,
156147
extra_data={
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
{% 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 %}
2-
User "{{ record_manager }}" with the role of "{{ role }}" has aborted the destruction of destruction list "{{ list_name }}" with reason: "{{ comment }}".
1+
{% 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 %}
2+
User "{{ record_manager }}" (member of group{{ n_groups|pluralize }} "{{ groups }}") has aborted the destruction of destruction list "{{ list_name }}" with reason: "{{ comment }}".
33
{% endblocktranslate %}
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,26 @@
1-
{% load i18n %}{% with added_co_reviewers=log.extra_data.added_co_reviewers|join:", " %}{% with removed_co_reviewers=log.extra_data.removed_co_reviewers|join:", " %}
1+
{% load i18n %}
2+
{% with added_co_reviewers=log.extra_data.added_co_reviewers|join:", " %}
3+
{% with removed_co_reviewers=log.extra_data.removed_co_reviewers|join:", " %}
4+
{% with groups=log.extra_data.user_groups|join:", " n_groups=log.extra_data.user_groups|length %}
5+
26
{% if log.extra_data.partial %}
3-
{% blocktranslate trimmed with role=log.extra_data.groups.0 list_name=log.content_object.name user=log.user added_co_reviewers=added_co_reviewers %}
4-
User "{{ user }}" with the role of "{{ role }}" has added these users as co-reviewers to the list "{{ list_name }}": {{ added_co_reviewers }}.
5-
{% endblocktranslate %}
6-
{% if removed_co_reviewers %}
7-
{% blocktranslate trimmed with removed_co_reviewers=removed_co_reviewers %}
8-
They also removed these co-reviewers: {{ removed_co_reviewers }}.
9-
{% endblocktranslate %}
10-
{% endif %}
7+
{% blocktranslate trimmed with list_name=log.content_object.name user=log.user added_co_reviewers=added_co_reviewers groups=groups n_groups=n_groups %}
8+
User "{{ user }}" (member of group{{ n_groups|pluralize }} "{{ groups }}") has added these users as co-reviewers to the list "{{ list_name }}": {{ added_co_reviewers }}.
9+
{% endblocktranslate %}
10+
11+
{% if removed_co_reviewers %}
12+
{% blocktranslate trimmed with removed_co_reviewers=removed_co_reviewers %}
13+
They also removed these co-reviewers: {{ removed_co_reviewers }}.
14+
{% endblocktranslate %}
15+
{% endif %}
1116
{% else %}
12-
{% blocktranslate trimmed with list_name=log.content_object.name role=log.extra_data.groups.0 user=log.user added_co_reviewers=added_co_reviewers %}
13-
User "{{ user }}" with the role of "{{ role }}" has replaced all the co-reviewers of the list "{{ list_name }}" with: {{ added_co_reviewers }}.
14-
{% endblocktranslate %}
17+
{% blocktranslate trimmed with list_name=log.content_object.name user=log.user added_co_reviewers=added_co_reviewers groups=groups n_groups=n_groups %}
18+
User "{{ user }}" (member of group{{ n_groups|pluralize }} "{{ groups }}") has replaced all the co-reviewers of the list "{{ list_name }}" with: {{ added_co_reviewers }}.
19+
{% endblocktranslate %}
1520
{% endif %}
1621

1722
{% blocktranslate trimmed with comment=log.extra_data.comment %}
18-
They added the comment: {{ comment }}.
23+
They added the comment: "{{ comment }}".
1924
{% endblocktranslate %}
20-
{% endwith %}{% endwith %}
2125

26+
{% endwith %}{% endwith %}{% endwith %}
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1-
{% load i18n %}{% blocktranslate trimmed with list_name=log.content_object.name role=log.extra_data.groups.0 author=log.user %}
2-
User "{{ author }}" with the role of "{{ role }}" has created destruction list "{{ list_name }}".
3-
{% endblocktranslate %}
1+
{% load i18n %}
2+
{% with groups=log.extra_data.user_groups|join:", " n_groups=log.extra_data.user_groups|length %}
3+
{% blocktranslate trimmed with list_name=log.content_object.name groups=groups n_groups=n_groups author=log.user %}
4+
User "{{ author }}" (member of group{{ n_groups|pluralize }} "{{ groups }}") has created destruction list "{{ list_name }}".
5+
{% endblocktranslate %}
6+
{% endwith %}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
{% load i18n %}
2-
{% 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 %}
3-
User "{{ user }}" with the role of "{{ role }}" has made destruction list "{{ list_name }}" final and assigned it to the archivist {{ archivist }}.
2+
{% with groups=log.extra_data.user_groups|join:", " n_groups=log.extra_data.user_groups|length %}
3+
{% 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 %}
4+
User "{{ user }}" (member of group{{ n_groups|pluralize }} "{{ groups }}") has made destruction list "{{ list_name }}" final and assigned it to the archivist "{{ archivist }}".
45
{% endblocktranslate %}
6+
{% endwith %}
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1-
{% 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 %}
2-
User "{{ user }}" with the role of "{{ role }}" has reassigned destruction list "{{ list_name }}".
3-
{% endblocktranslate %}
1+
{% load i18n %}
2+
{% with groups=log.extra_data.user_groups|join:", " n_groups=log.extra_data.user_groups|length %}
3+
{% blocktranslate trimmed with timestamp=log.timestamp|date:"c" list_name=log.content_object.name groups=groups n_groups=n_groups user=log.user %}
4+
User "{{ user }}" (member of group{{ n_groups|pluralize }} "{{ groups }}") has reassigned destruction list "{{ list_name }}" on "{{ timestamp }}".
5+
{% endblocktranslate %}
6+
{% endwith %}
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,11 @@
1-
{% 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 %}
2-
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 %}
1+
{% load i18n %}
2+
{% with groups=log.extra_data.user_groups|join:", " n_groups=log.extra_data.user_groups|length %}
3+
{% 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 %}
4+
User "{{ user }}" (member of group{{ n_groups|pluralize }} "{{ groups }}") has reviewed the list "{{ list_name }}" on "{{ timestamp }}".
5+
{% endblocktranslate %}
6+
{% if approved %}
7+
{% translate "The destruction list was approved." %}
8+
{% else %}
9+
{% translate "The destruction list was rejected." %}
10+
{% endif %}
11+
{% endwith %}
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1-
{% load i18n %}{% blocktranslate trimmed with list_name=log.content_object.name role=log.extra_data.groups.0 user=log.user %}
2-
User "{{ user }}" with the role of "{{ role }}" has updated destruction list "{{ list_name }}".
3-
{% endblocktranslate %}
1+
{% load i18n %}
2+
{% with groups=log.extra_data.user_groups|join:", " n_groups=log.extra_data.user_groups|length %}
3+
{% blocktranslate trimmed with list_name=log.content_object.name groups=groups n_groups=n_groups user=log.user %}
4+
User "{{ user }}" (member of group{{ n_groups|pluralize }} "{{ groups }}") has updated destruction list "{{ list_name }}".
5+
{% endblocktranslate %}
6+
{% endwith %}

0 commit comments

Comments
 (0)