Skip to content

Commit

Permalink
fix: improve help text dor Documents.informed_consent
Browse files Browse the repository at this point in the history
  • Loading branch information
EdoStorm96 committed Apr 15, 2024
1 parent 0fe911a commit 4953267
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 15 deletions.
33 changes: 21 additions & 12 deletions locale/en/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-04-10 14:51+0200\n"
"POT-Creation-Date: 2024-04-15 11:16+0200\n"
"PO-Revision-Date: 2024-04-03 12:32+0200\n"
"Last-Translator: Anna Asbury <[email protected]>\n"
"Language-Team: \n"
Expand Down Expand Up @@ -2113,18 +2113,18 @@ msgstr "If you have not already done so, it is highly recommended you attend: "

#: proposals/templates/proposals/proposal_data_management.html:54
msgid ""
"de workshop <a href=\"https://www.uu.nl/en/node/75859\" "
"De workshop <a href=\"https://www.uu.nl/en/node/75859\" "
"target=\"_blank\">Quick start to Research Data Management</a>"
msgstr ""
"the workshop <a href=\"https://www.uu.nl/en/research/research-data-"
"The workshop <a href=\"https://www.uu.nl/en/research/research-data-"
"management/training-workshops/online-training-learn-to-write-your-dmp\" "
"target=\"_blank\">Quick start to Research Data Management</a>"

#: proposals/templates/proposals/proposal_data_management.html:60
msgid ""
"De online training <a href=\"https://www.uu.nl/en/research/research-data-"
"management/training-workshops/online-training-learn-to-write-your-dmp\" "
"target=\"_blank\"> Write your DMP</a>"
"target=\"_blank\">Write your DMP</a>"
msgstr ""
"The online training <a href=\"https://www.uu.nl/en/research/research-data-"
"management/training-workshops/online-training-learn-to-write-your-dmp\" "
Expand Down Expand Up @@ -4590,23 +4590,29 @@ msgid "Upload hier de toestemmingsverklaring (in .pdf of .doc(x)-formaat)"
msgstr ""
"Please upload the declaration of consent here (in .pdf or .doc(x)-format)"

#: studies/models.py:518
msgid "Bij algemeen belang, dien hier s.v.p. een leeg Word document in."
msgstr "In case of public interest, please upload an empty Word document."
#: studies/models.py:519
msgid ""
"Als je de AVG grondslag 'Algemeen belang' gebruikt, en er helemaal geen "
"toestemmingsverklaring nodig is (ook niet voor bijzondere persoonsgegevens "
"of opnames), upload dan een leeg document in dit veld."
msgstr ""
"When the legal basis for your research is 'Public interest', and no "
"declarations of consent are required (neither for special categories of "
"data, nor for recordings), please upload an empty document in this field."

#: studies/models.py:526
#: studies/models.py:528
msgid "Upload hier de informatiebrief (in .pdf of .doc(x)-formaat)"
msgstr "Please upload the information letter here (in .pdf or .doc(x)-format)"

#: studies/models.py:535
#: studies/models.py:537
msgid ""
"Upload hier de toestemmingsverklaring voor de leiding of het management van "
"de instelling (in .pdf of .doc(x)-format)"
msgstr ""
"Please upload the declaration of consent for the management of the school or "
"institution (in .pdf or .doc(x)-format)"

#: studies/models.py:540
#: studies/models.py:542
msgid ""
"Upload indien mogelijk een ondertekende versie van het document. Upload als "
"deze nog niet bestaat een blanco versie, en stuur de ondertekende versie "
Expand All @@ -4617,15 +4623,15 @@ msgstr ""
"and follow up by sending a signed copy to the secretary of the FEtC-H once "
"available."

#: studies/models.py:548
#: studies/models.py:550
msgid ""
"Upload hier de informatiebrief voor de leiding of het management van de "
"instelling (in .pdf of .doc(x)-formaat)"
msgstr ""
"Please upload the the information letter for the management of the school or "
"institution (in .pdf or .doc(x)-format)"

#: studies/models.py:558
#: studies/models.py:560
msgid ""
"Upload hier de informatiebrief voor de ouders of verzorgers (in .pdf of ."
"doc(x)-formaat)"
Expand Down Expand Up @@ -5238,3 +5244,6 @@ msgstr "Task edited"
#: tasks/views/task_views.py:56
msgid "Taak verwijderd"
msgstr "Task deleted"

#~ msgid "Bij algemeen belang, dien hier s.v.p. een leeg Word document in."
#~ msgstr "In case of public interest, please upload an empty Word document."
4 changes: 2 additions & 2 deletions studies/migrations/0028_alter_documents_informed_consent.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by Django 3.2.20 on 2024-04-09 12:48
# Generated by Django 3.2.20 on 2024-04-15 09:15

from django.db import migrations, models
import main.validators
Expand All @@ -17,7 +17,7 @@ class Migration(migrations.Migration):
name="informed_consent",
field=models.FileField(
blank=True,
help_text="Bij algemeen belang, dien hier s.v.p. een leeg Word document in.",
help_text="Als je de AVG grondslag 'Algemeen belang' gebruikt, en er helemaal geen toestemmingsverklaring nodig is (ook niet voor bijzondere persoonsgegevens of opnames), upload dan een leeg document in dit veld.",
storage=proposals.utils.proposal_utils.OverwriteStorage(),
upload_to=proposals.utils.proposal_utils.FilenameFactory(
"Informed_Consent"
Expand Down
4 changes: 3 additions & 1 deletion studies/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,9 @@ class Documents(models.Model):

informed_consent = models.FileField(
_("Upload hier de toestemmingsverklaring (in .pdf of .doc(x)-formaat)"),
help_text=_("Bij algemeen belang, dien hier s.v.p. een leeg Word document in."),
help_text=_(
"Als je de AVG grondslag 'Algemeen belang' gebruikt, en er helemaal geen toestemmingsverklaring nodig is (ook niet voor bijzondere persoonsgegevens of opnames), upload dan een leeg document in dit veld."
),
blank=True,
validators=[validate_pdf_or_doc],
upload_to=INFORMED_CONSENT_FILENAME,
Expand Down

0 comments on commit 4953267

Please sign in to comment.