{{ contact.full_name }}
{% if contact.guardian_of.count > 1 %}
- {% icon 'users' label=_('This guardian has other wards who may also be suitable for this study.') %}
+ {% icon 'users' label=_('This person represents other subjects who may also be suitable for this study.') %}
{% endif %}
{% if name == 'guardians_remove' %}
diff --git a/castellum/contacts/templates/contacts/contact_form.html b/castellum/contacts/templates/contacts/contact_form.html
index d0856e847951b54c15a5e44a473a6ab32673fa8a..05946a89ea3749b09788f7b8cb823665556c074e 100644
--- a/castellum/contacts/templates/contacts/contact_form.html
+++ b/castellum/contacts/templates/contacts/contact_form.html
@@ -15,7 +15,7 @@
{% include 'utils/form_errors.html' with form=form %}
{% if not object.is_complete %}
-
{% translate "Gender and date of birth as well as at least one of email, phone number, address, or guardian should be provided." %}
+
{% translate "Gender and date of birth as well as at least one of email, phone number, address, or legal representative should be provided." %}
{% endif %}
{% csrf_token %}
@@ -31,7 +31,7 @@
{% if form.guardians_blocked > 0 %}
- {% blocktranslate with count=form.guardians_blocked %}{{ count }} guardians not listed because of insufficient privacy level.{% endblocktranslate %}
+ {% blocktranslate with count=form.guardians_blocked %}{{ count }} legal representatives not listed because of insufficient privacy level.{% endblocktranslate %}
{% endif %}
@@ -49,13 +49,13 @@
{% include 'contacts/__guardian_item.html' with name=form.guardians_add.name pk=subject.pk label=subject label=subject.contact.full_name removed=False %}
{% endfor %}
-
+
{% else %}
{% has_perm 'subjects.view_subject' user as can_view_subject %}
{% for subject_id, contact in form.guardians %}
-
{% translate 'Guardian' %}
+
{% translate 'Legal representative' %}
{{ contact }}
diff --git a/castellum/recruitment/templates/recruitment/contact.html b/castellum/recruitment/templates/recruitment/contact.html
index d86d94ed9bd65421a62ff1be9ed035fde6d1f182..ba17cb07265905f18e4eb05b414b5e38c2888a2b 100644
--- a/castellum/recruitment/templates/recruitment/contact.html
+++ b/castellum/recruitment/templates/recruitment/contact.html
@@ -16,7 +16,7 @@
{% endif %}
{% if subject.contact.has_guardian and study.geo_filter %}
- {% translate 'This study uses a geographic filter. Please verify that the subject lives at the same address as one of their guardians.' %}
+ {% translate 'This study uses a geographic filter. Please verify that the subject lives at the same address as one of their legal representatives.' %}
{% endif %}
{% endif %}
diff --git a/castellum/subjects/migrations/0023_subject_blocked.py b/castellum/subjects/migrations/0023_subject_blocked.py
index 37b1c136f95b9069d464259c731c4ea8bab9e100..9cb3ab32eec8a2bb63fa588e075a3261edb40102 100644
--- a/castellum/subjects/migrations/0023_subject_blocked.py
+++ b/castellum/subjects/migrations/0023_subject_blocked.py
@@ -13,6 +13,6 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='subject',
name='blocked',
- field=models.BooleanField(default=False, help_text='The subject has been blocked due to inappropriate behaviour. They will neither be considered for recruitment, nor contacted as guardians. Blocking this subject does not automatically block their ward nor their co-guardians. They may thus still receive information about the recruitment process of their wards.', verbose_name='Subject is blocked'),
+ field=models.BooleanField(default=False, help_text='The person has been blocked due to inappropriate behaviour. They will neither be considered for recruitment, nor contacted as a legal representative. Blocking this person does not automatically block any represented subjects nor co-representatives. They may thus still receive information about the recruitment process.', verbose_name='Subject is blocked'),
),
]
diff --git a/castellum/subjects/models.py b/castellum/subjects/models.py
index 896dadfea72937bb9e317a5985ddb0efd5e22cf0..3456122752b59cd4079758deb7aa931b5a370538 100644
--- a/castellum/subjects/models.py
+++ b/castellum/subjects/models.py
@@ -87,11 +87,11 @@ class Subject(TimeStampedModel):
deceased = models.BooleanField(_('Subject is deceased'), default=False)
blocked = models.BooleanField(_('Subject is blocked'), default=False, help_text=_(
- 'The subject has been blocked due to inappropriate behaviour. '
- 'They will neither be considered for recruitment, nor contacted as guardians. '
- 'Blocking this subject does not automatically block their ward nor their '
- 'co-guardians. They may thus still receive information about the recruitment '
- 'process of their wards.'
+ 'The person has been blocked due to inappropriate behaviour. '
+ 'They will neither be considered for recruitment, nor contacted as a legal representative. '
+ 'Blocking this person does not automatically block any represented subjects nor '
+ 'co-representatives. They may thus still receive information about the recruitment '
+ 'process.'
))
source = models.CharField(_('Data source'), max_length=128, blank=True)
diff --git a/castellum/subjects/templates/subjects/guardian_search.html b/castellum/subjects/templates/subjects/guardian_search.html
index b0fb97e173cfcbc5fb5d05c9e29c89f29b38901f..e25f80aa39a322accb84d3857e0fafa12fb71c3c 100644
--- a/castellum/subjects/templates/subjects/guardian_search.html
+++ b/castellum/subjects/templates/subjects/guardian_search.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{% load i18n static bootstrap4 auth utils %}
-{% block title %}{% translate "Guardians" %} · {{ block.super }}{% endblock %}
+{% block title %}{% translate "Legal representatives" %} · {{ block.super }}{% endblock %}
{% block content %}
{% translate 'Total number of subjects' %}: {{ count_total }}
diff --git a/castellum/subjects/templates/subjects/subject_confirm_delete.html b/castellum/subjects/templates/subjects/subject_confirm_delete.html
index 6253ae391914b0ae9da84ae53d4cf03749eaa0c3..6dd4f2ec2c4377279f67d7d0832e6210e4226ca4 100644
--- a/castellum/subjects/templates/subjects/subject_confirm_delete.html
+++ b/castellum/subjects/templates/subjects/subject_confirm_delete.html
@@ -9,7 +9,7 @@
{% if is_last_guardian %}
- {% translate "This subject is the only guardian of another subject. Deletion means that this subject's ward becomes unreachable!" %}
+ {% translate "This person is the only legal representative of another subject. Deletion means that the subject represented by this person becomes unreachable!" %}
{% for c in subject.contact.guardian_of.all %}
{% has_privacy_level c.subject.privacy_level user as can_access %}
@@ -94,7 +94,7 @@
- {% translate 'Guardianship' %}
+ {% translate 'Legal representative' %}
{% translate 'Art. 6 (1) lit. a, Art. 9 (2) lit. a GDPR and Art. 1626, 1902 BGB' %}
@@ -102,7 +102,7 @@
{{ subject.contact|display:'is_guardian' }}
{% else %}
{% url 'subjects:index' as url %}
- {% blocktranslate with url=url %}If applicable, find or create a subject and set this one as their guardian.{% endblocktranslate %}
+ {% blocktranslate with url=url %}If applicable, find or create a subject and set this one as their legal representative.{% endblocktranslate %}
{% endif %}
diff --git a/tests/contacts/forms/test_contact_form.py b/tests/contacts/forms/test_contact_form.py
index f862023b788456ecd97837b86a512a745f719d21..403800c757d45aafe177e1fa9a0f2c72f9234780 100644
--- a/tests/contacts/forms/test_contact_form.py
+++ b/tests/contacts/forms/test_contact_form.py
@@ -284,7 +284,7 @@ def test_contact_form_with_guardians_remove(user, full_data, contact):
@pytest.mark.django_db
def test_contact_form_underage_without_guardian(user, full_data):
- msg = 'Subjects under the age of 16 need a legal guardian.'
+ msg = 'Subjects under the age of 16 need a legal representative.'
full_data.update({
'date_of_birth': '{}-01-01'.format(datetime.date.today().year),
})