diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index 4af320ac4..7be6e6b94 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -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-15 11:16+0200\n" "PO-Revision-Date: 2024-04-03 12:32+0200\n" "Last-Translator: Anna Asbury \n" "Language-Team: \n" @@ -2102,21 +2102,35 @@ 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 Data " -"Privacy Handboek 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 Data " -"Privacy Handbook." +"Als je dit nog niet gedaan hebt, wordt er sterk aangeraden om de volgende " +"workshop/online training te volgen:" +msgstr "If you have not already done so, it is highly recommended you attend: " -#: proposals/templates/proposals/proposal_data_management.html:53 +#: proposals/templates/proposals/proposal_data_management.html:54 +msgid "" +"De workshop Quick start to Research Data Management" +msgstr "" +"The workshop Quick start to Research Data Management" + +#: proposals/templates/proposals/proposal_data_management.html:60 +msgid "" +"De online training Write your DMP" +msgstr "" +"The online training Write your DMP" + +#: proposals/templates/proposals/proposal_data_management.html:67 msgid "" "Voor advies op het gebied van data management planning kun je contact " "opnemen met de datamanager GW, Frans de Liagre Böhl via datamanagement.gw@uu.nl, 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:71 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:73 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 " @@ -2144,7 +2158,7 @@ msgstr "" "regulation is in line with European GDPR privacy legislation." -#: proposals/templates/proposals/proposal_data_management.html:65 +#: proposals/templates/proposals/proposal_data_management.html:79 msgid "" "De autoriteit persoonsgegevens heeft de workshop Handling personal data in research " +"Voor vragen over privacy, zoals: \"Wat zijn persoonlijke gegevens?\" of " +"\"Wanneer mag ik mijn onderzoek anoniem noemen?\", raden we je aan het Data " +"Privacy Handboek te raadplegen." msgstr "" -"
  • the workshop Handling personal data in research
    • " +"For all your questions regarding privacy, e.g.: \"What are personal data?\" " +"or \"When may I call my research anonymous?\", consult the Data Privacy Handbook." -#: proposals/templates/proposals/proposal_data_management.html:86 +#: proposals/templates/proposals/proposal_data_management.html:93 msgid "" "Voor advies op het gebied van privacy en de AVG kun je contact opnemen met " "de privacy officer van GW via privacy." @@ -3504,7 +3515,7 @@ msgstr "" "Click 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" @@ -4579,11 +4590,21 @@ 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: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: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:534 +#: studies/models.py:537 msgid "" "Upload hier de toestemmingsverklaring voor de leiding of het management van " "de instelling (in .pdf of .doc(x)-format)" @@ -4591,7 +4612,7 @@ 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: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 " @@ -4602,7 +4623,7 @@ 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:550 msgid "" "Upload hier de informatiebrief voor de leiding of het management van de " "instelling (in .pdf of .doc(x)-formaat)" @@ -4610,7 +4631,7 @@ 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:560 msgid "" "Upload hier de informatiebrief voor de ouders of verzorgers (in .pdf of ." "doc(x)-formaat)" @@ -5222,4 +5243,7 @@ msgstr "Task edited" #: tasks/views/task_views.py:56 msgid "Taak verwijderd" -msgstr "Task deleted" \ No newline at end of file +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." diff --git a/proposals/templates/proposals/proposal_data_management.html b/proposals/templates/proposals/proposal_data_management.html index 65cd7e51c..5453e7f19 100644 --- a/proposals/templates/proposals/proposal_data_management.html +++ b/proposals/templates/proposals/proposal_data_management.html @@ -46,16 +46,22 @@

    {% trans "Data Management Plan" %}

    {% trans "Nuttige workshops:" %}

    {% blocktrans trimmed %} - Als je dit nog niet gedaan hebt, wordt er sterk aangeraden om de volgende workshop te volgen: + Als je dit nog niet gedaan hebt, wordt er sterk aangeraden om de volgende workshop/online training te volgen: {% endblocktrans %}

    {% blocktrans trimmed %} diff --git a/studies/migrations/0028_alter_documents_informed_consent.py b/studies/migrations/0028_alter_documents_informed_consent.py new file mode 100644 index 000000000..b2f8cbfb8 --- /dev/null +++ b/studies/migrations/0028_alter_documents_informed_consent.py @@ -0,0 +1,29 @@ +# Generated by Django 3.2.20 on 2024-04-15 09:15 + +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="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" + ), + validators=[main.validators.validate_pdf_or_doc], + verbose_name="Upload hier de toestemmingsverklaring (in .pdf of .doc(x)-formaat)", + ), + ), + ] diff --git a/studies/models.py b/studies/models.py index 8644113f0..b5463855c 100644 --- a/studies/models.py +++ b/studies/models.py @@ -515,6 +515,9 @@ class Documents(models.Model): informed_consent = models.FileField( _("Upload hier de toestemmingsverklaring (in .pdf of .doc(x)-formaat)"), + 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,