Skip to content

Commit

Permalink
feat: add help text to Documents.informed_consent
Browse files Browse the repository at this point in the history
  • Loading branch information
EdoStorm96 committed Apr 9, 2024
1 parent 6275201 commit f1a8430
Show file tree
Hide file tree
Showing 3 changed files with 65 additions and 36 deletions.
80 changes: 44 additions & 36 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-03 12:31+0200\n"
"POT-Creation-Date: 2024-04-09 14:48+0200\n"
"PO-Revision-Date: 2024-04-03 12:32+0200\n"
"Last-Translator: Anna Asbury <anna.asbury@annaasbury.com>\n"
"Language-Team: \n"
Expand Down Expand Up @@ -2102,21 +2102,28 @@ msgstr ""
"funding, provided by Utrecht University."

#: proposals/templates/proposals/proposal_data_management.html:46
msgid "Nuttige informatie:"
msgstr "Useful information:"
msgid "Nuttige workshops:"
msgstr "Recommended workshops"

#: proposals/templates/proposals/proposal_data_management.html:48
msgid ""
"Voor vragen over privacy, zoals: \"Wat zijn persoonlijke gegevens?\" of "
"\"Wanneer mag ik mijn onderzoek anoniem noemen?\", raden we je aan het <a "
"href=\"https://utrechtuniversity.github.io/dataprivacyhandbook/\">Data "
"Privacy Handboek</a> te raadplegen."
msgstr "For all your questions regarding privacy, e.g.: \"What are personal "
"data?\" or \"When may I call my research anonymous?\", consult the <a "
"href=\"https://utrechtuniversity.github.io/dataprivacyhandbook/\">Data "
"Privacy Handbook</a>."
"Als je dit nog niet gedaan hebt, wordt er sterk aangeraden om de volgende "
"workshop te volgen:"
msgstr "If you have not already done so, it is highly recommended you attend: "

#: proposals/templates/proposals/proposal_data_management.html:53
#, fuzzy
#| msgid ""
#| "<li> de workshop <a href=\"https://www.uu.nl/en/node/81799\" "
#| "target=\"_blank\">Handling personal data in research</a> </li>"
msgid ""
"<li> de workshop <a href=\"https://www.uu.nl/en/node/75859\" "
"target=\"_blank\">Quick start to Research Data Management</a> </li>"
msgstr ""
"<li>the workshop <a href=\"https://www.uu.nl/en/node/81799\" "
"target=\"_blank\">Handling personal data in research</a></li>"

#: proposals/templates/proposals/proposal_data_management.html:61
msgid ""
"Voor advies op het gebied van data management planning kun je contact "
"opnemen met de datamanager GW, Frans de Liagre Böhl via <a href=\"mailto:"
Expand All @@ -2127,11 +2134,11 @@ msgstr ""
"target=\"_blank\">datamanagement.gw@uu.nl</a>, who is the data manager of "
"the Faculty of Humanities."

#: proposals/templates/proposals/proposal_data_management.html:57
#: proposals/templates/proposals/proposal_data_management.html:65
msgid "Privacy: AVG en GDPR"
msgstr "Privacy: AVG and GDPR"

#: proposals/templates/proposals/proposal_data_management.html:59
#: proposals/templates/proposals/proposal_data_management.html:67
msgid ""
"Wanneer je persoonsgebonden data verzamelt, zorg je er voor dat je je houdt "
"aan de Algemene Verordening Gegevensbescherming, of AVG. Deze wet is de "
Expand All @@ -2144,7 +2151,7 @@ msgstr ""
"regulation is in line with European <a href=\"https://gdpr.eu/\" "
"target=\"_blank\">GDPR privacy legislation</a>."

#: proposals/templates/proposals/proposal_data_management.html:65
#: proposals/templates/proposals/proposal_data_management.html:73
msgid ""
"De autoriteit persoonsgegevens heeft <a href=\"https://www."
"autoriteitpersoonsgegevens.nl/nl/onderwerpen/algemene-informatie-avg/"
Expand All @@ -2157,25 +2164,22 @@ msgstr ""
"how the AVG affects data collectors, though only in Dutch at the time of "
"writing. "

#: proposals/templates/proposals/proposal_data_management.html:71
msgid "Nuttige workshops:"
msgstr "Recommended workshops"

#: proposals/templates/proposals/proposal_data_management.html:73
msgid ""
"Als je dit nog niet gedaan hebt, wordt er sterk aangeraden om de volgende "
"workshop te volgen:"
msgstr "If you have not already done so, it is highly recommended you attend: "
#: proposals/templates/proposals/proposal_data_management.html:79
msgid "Nuttige informatie:"
msgstr "Useful information:"

#: proposals/templates/proposals/proposal_data_management.html:78
#: proposals/templates/proposals/proposal_data_management.html:81
msgid ""
"<li> de workshop <a href=\"https://www.uu.nl/en/node/81799\" "
"target=\"_blank\">Handling personal data in research</a> </li>"
"Voor vragen over privacy, zoals: \"Wat zijn persoonlijke gegevens?\" of "
"\"Wanneer mag ik mijn onderzoek anoniem noemen?\", raden we je aan het <a "
"href=\"https://utrechtuniversity.github.io/dataprivacyhandbook/\">Data "
"Privacy Handboek</a> te raadplegen."
msgstr ""
"<li>the workshop <a href=\"https://www.uu.nl/en/node/81799\" "
"target=\"_blank\">Handling personal data in research</a></li>"
"For all your questions regarding privacy, e.g.: \"What are personal data?\" "
"or \"When may I call my research anonymous?\", consult the <a href=\"https://"
"utrechtuniversity.github.io/dataprivacyhandbook/\">Data Privacy Handbook</a>."

#: proposals/templates/proposals/proposal_data_management.html:86
#: proposals/templates/proposals/proposal_data_management.html:87
msgid ""
"Voor advies op het gebied van privacy en de AVG kun je contact opnemen met "
"de privacy officer van GW via <a href=\"mailto:privacy.gw@uu.nl\">privacy."
Expand Down Expand Up @@ -3504,7 +3508,7 @@ msgstr ""
"Click <img src=\"%(img_decide)s\" title=\"Decide\"> to make your decision "
"(as a supervisor)."

#: reviews/templates/reviews/action_explaination.html:53
#: reviews/templates/reviews/action_explaination.html:55
msgid "Uitleg secretaris"
msgstr "Explanation for secretary"

Expand Down Expand Up @@ -4579,19 +4583,23 @@ 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:525
#: 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:526
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:534
#: studies/models.py:535
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:539
#: studies/models.py:540
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 @@ -4602,15 +4610,15 @@ msgstr ""
"and follow up by sending a signed copy to the secretary of the FEtC-H once "
"available."

#: studies/models.py:547
#: studies/models.py:548
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:557
#: studies/models.py:558
msgid ""
"Upload hier de informatiebrief voor de ouders of verzorgers (in .pdf of ."
"doc(x)-formaat)"
Expand Down Expand Up @@ -5222,4 +5230,4 @@ msgstr "Task edited"

#: tasks/views/task_views.py:56
msgid "Taak verwijderd"
msgstr "Task deleted"
msgstr "Task deleted"
20 changes: 20 additions & 0 deletions studies/migrations/0028_alter_documents_informed_consent.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Generated by Django 3.2.20 on 2024-04-09 12:48

from django.db import migrations, models
import main.validators
import proposals.utils.proposal_utils


class Migration(migrations.Migration):

dependencies = [
('studies', '0027_auto_20230227_1425'),
]

operations = [
migrations.AlterField(
model_name='documents',
name='informed_consent',
field=models.FileField(blank=True, help_text='Bij algemeen belang, dien hier s.v.p. een leeg Word document in.', storage=proposals.utils.proposal_utils.OverwriteStorage(), upload_to=proposals.utils.proposal_utils.FilenameFactory('Informed_Consent'), validators=[main.validators.validate_pdf_or_doc], verbose_name='Upload hier de toestemmingsverklaring (in .pdf of .doc(x)-formaat)'),
),
]
1 change: 1 addition & 0 deletions studies/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -515,6 +515,7 @@ 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."),
blank=True,
validators=[validate_pdf_or_doc],
upload_to=INFORMED_CONSENT_FILENAME,
Expand Down

0 comments on commit f1a8430

Please sign in to comment.