diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index 423d8517e..6f60d5ff3 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-02-01 16:42+0100\n" +"POT-Creation-Date: 2024-03-19 16:09+0100\n" "PO-Revision-Date: 2024-01-17 10:48+0100\n" "Last-Translator: Anna Asbury \n" "Language-Team: \n" @@ -63,11 +63,11 @@ msgstr "FAQ" msgid "Frequently Asked Questions" msgstr "Frequently Asked Questions" -#: fetc/settings.py:128 +#: fetc/settings.py:129 msgid "Nederlands" msgstr "Dutch" -#: fetc/settings.py:129 +#: fetc/settings.py:130 msgid "Engels" msgstr "English" @@ -204,11 +204,11 @@ msgstr "Log in" msgid "Log uit" msgstr "Log out" -#: main/models.py:8 main/utils.py:15 proposals/utils/pdf_diff_logic.py:244 +#: main/models.py:8 main/utils.py:16 proposals/utils/pdf_diff_logic.py:244 msgid "ja" msgstr "yes" -#: main/models.py:9 main/utils.py:15 proposals/utils/pdf_diff_logic.py:244 +#: main/models.py:9 main/utils.py:16 proposals/utils/pdf_diff_logic.py:244 msgid "nee" msgstr "no" @@ -261,7 +261,7 @@ msgid "Gebruiksersnaam" msgstr "Username" #: main/templates/auth/user_detail.html:21 -#: proposals/templates/proposals/proposal_pdf.html:117 +#: proposals/templates/proposals/proposal_pdf.html:115 msgid "E-mail" msgstr "E-mail" @@ -375,7 +375,7 @@ msgid "Bevestigingsbrief versturen" msgstr "Send confirmation letter" #: main/templates/auth/user_detail.html:97 -#: proposals/templates/proposals/proposal_confirmation.html:38 +#: proposals/templates/proposals/proposal_confirmation.html:39 #: reviews/templates/reviews/vue_templates/decision_list.html:90 #: reviews/templates/reviews/vue_templates/review_list.html:83 msgid "Bevestigingsbrief verstuurd" @@ -386,20 +386,21 @@ msgid "<< Opslaan en vorige stap" msgstr "<< Save and go back to previous step" #: main/templates/base/form_buttons.html:13 -#: main/templates/base/form_buttons.html:17 -#: main/templates/base/form_buttons.html:21 +#: main/templates/base/form_buttons.html:16 +#: main/templates/base/form_buttons.html:20 +#: main/templates/base/form_buttons.html:24 msgid "Terug naar begin aanvraag" msgstr "Return to start of application" -#: main/templates/base/form_buttons.html:26 +#: main/templates/base/form_buttons.html:29 msgid "Terug naar begin traject" msgstr "Back to the beginning of the trajectory" -#: main/templates/base/form_buttons.html:30 +#: main/templates/base/form_buttons.html:33 msgid "Terug naar begin sessie" msgstr "Back to the beginning of the session" -#: main/templates/base/form_buttons.html:34 +#: main/templates/base/form_buttons.html:37 msgid "Opslaan en volgende stap >>" msgstr "Save and go to next step >>" @@ -1051,12 +1052,12 @@ msgstr "" "%(title)s(reference number %(ref_number)s), trajectory %(order)s." #: observations/templates/observations/observation_update_attachments.html:43 -#: proposals/templates/proposals/proposal_confirmation.html:39 +#: proposals/templates/proposals/proposal_confirmation.html:36 #: proposals/templates/proposals/proposal_diff.html:55 #: proposals/templates/proposals/proposal_update_attachments.html:30 #: proposals/templates/proposals/proposal_update_date_start.html:33 #: reviews/templates/reviews/change_chamber_form.html:23 -#: reviews/templates/reviews/decision_form.html:93 +#: reviews/templates/reviews/decision_form.html:92 #: reviews/templates/reviews/review_assign_form.html:46 #: reviews/templates/reviews/review_close_form.html:40 #: reviews/templates/reviews/review_discontinue_form.html:70 @@ -1908,8 +1909,8 @@ msgstr "Delete" #: proposals/templates/proposals/proposal_confirm_delete.html:21 #: proposals/templates/proposals/proposal_copy.html:93 -#: tasks/templates/tasks/session_confirm_delete.html:22 -#: tasks/templates/tasks/task_confirm_delete.html:22 +#: tasks/templates/tasks/session_confirm_delete.html:21 +#: tasks/templates/tasks/task_confirm_delete.html:21 msgid "Annuleren" msgstr "Cancel" @@ -2200,10 +2201,10 @@ msgstr "" #: proposals/templates/proposals/proposal_form_pre_approved.html:7 #: proposals/templates/proposals/proposal_form_pre_approved.html:83 #: proposals/utils/pdf_diff_logic.py:428 proposals/utils/proposal_utils.py:47 -#: proposals/utils/proposal_utils.py:68 proposals/utils/validate_proposal.py:40 -#: proposals/utils/validate_proposal.py:50 -#: proposals/utils/validate_proposal.py:57 -#: proposals/utils/validate_proposal.py:64 +#: proposals/utils/proposal_utils.py:68 proposals/utils/validate_proposal.py:41 +#: proposals/utils/validate_proposal.py:51 +#: proposals/utils/validate_proposal.py:58 +#: proposals/utils/validate_proposal.py:65 msgid "Algemene informatie over de aanvraag" msgstr "General information about the application" @@ -2352,7 +2353,7 @@ msgstr "" "Click to submit an application to " "the archive." -#: proposals/templates/proposals/proposal_pdf.html:86 +#: proposals/templates/proposals/proposal_pdf.html:84 #, python-format msgid "" "FETC-GW - %(title)s (referentienummer %(reviewing_committee)s-" @@ -2361,25 +2362,25 @@ msgstr "" "FEtC-H - %(title)s (reference number %(reviewing_committee)s-" "%(reference_number)s, submitted by %(submitter)s)" -#: proposals/templates/proposals/proposal_pdf.html:92 +#: proposals/templates/proposals/proposal_pdf.html:90 #, python-format msgid "%(type)s van referentienummer %(reference_number)s" msgstr "%(type)s of reference number %(reference_number)s" -#: proposals/templates/proposals/proposal_pdf.html:106 +#: proposals/templates/proposals/proposal_pdf.html:104 #, python-format msgid "Referentienummer %(reference_number)s" msgstr "Reference number %(reference_number)s" -#: proposals/templates/proposals/proposal_pdf.html:111 +#: proposals/templates/proposals/proposal_pdf.html:109 msgid "Huidige staat van de aanvraag" msgstr "Current state of the application" -#: proposals/templates/proposals/proposal_pdf.html:113 +#: proposals/templates/proposals/proposal_pdf.html:111 msgid "Indiener" msgstr "Applicant" -#: proposals/templates/proposals/proposal_pdf.html:115 +#: proposals/templates/proposals/proposal_pdf.html:113 #: tasks/templates/tasks/task_list.html:7 msgid "Naam" msgstr "Name" @@ -2424,8 +2425,8 @@ msgid "" "Het reglement van de FEtC-H." msgstr "" -"The regulations of the FEtC-H ." +"The regulations of the FEtC-H ." #: proposals/templates/proposals/proposal_start.html:31 #: proposals/templates/proposals/proposal_start_practice.html:31 @@ -2909,7 +2910,7 @@ msgstr "Additional forms" #: proposals/templates/proposals/study_start.html:7 #: proposals/templates/proposals/study_start.html:63 #: proposals/utils/pdf_diff_logic.py:530 -#: proposals/utils/validate_proposal.py:94 +#: proposals/utils/validate_proposal.py:95 msgid "Eén of meerdere trajecten?" msgstr "One or more trajectories?" @@ -2943,7 +2944,7 @@ msgid "Revisie/amendement" msgstr "Revision/amendment" #: proposals/templates/proposals/translated_consent_forms.html:24 -#: proposals/utils/validate_proposal.py:223 +#: proposals/utils/validate_proposal.py:224 msgid "Vertaling informed consent formulieren" msgstr "Translation of informed consent forms" @@ -3138,8 +3139,8 @@ msgstr "Overview and self-assessment of the entire study" msgid "Extra formulieren " msgstr "Additional forms " -#: proposals/utils/proposal_utils.py:51 proposals/utils/validate_proposal.py:76 -#: proposals/utils/validate_proposal.py:83 +#: proposals/utils/proposal_utils.py:51 proposals/utils/validate_proposal.py:77 +#: proposals/utils/validate_proposal.py:84 msgid "Ethische toetsing nodig door een METC?" msgstr "Ethical assessment by a METC necessary?" @@ -3179,41 +3180,41 @@ msgstr "FEtC-H: A revised application uses lab facilities" msgid "FETC-GW: nieuwe aanvraag gebruikt labfaciliteiten" msgstr "FEtC-H: New application uses lab facilities" -#: proposals/utils/validate_proposal.py:105 +#: proposals/utils/validate_proposal.py:106 msgid "De deelnemers (traject {})" msgstr "Participants (trajectory {})" -#: proposals/utils/validate_proposal.py:113 +#: proposals/utils/validate_proposal.py:114 msgid "De onderzoekstype(n) (traject {})" msgstr "Type(s) of research (trajectory {})" -#: proposals/utils/validate_proposal.py:123 -#: proposals/utils/validate_proposal.py:132 +#: proposals/utils/validate_proposal.py:124 +#: proposals/utils/validate_proposal.py:133 msgid "Het interventieonderzoek (traject {})" msgstr "Intervention study (trajectory {})" -#: proposals/utils/validate_proposal.py:144 -#: proposals/utils/validate_proposal.py:153 +#: proposals/utils/validate_proposal.py:145 +#: proposals/utils/validate_proposal.py:154 msgid "Het observatieonderzoek (traject {})" msgstr "Observational study (trajectory {})" -#: proposals/utils/validate_proposal.py:164 +#: proposals/utils/validate_proposal.py:165 msgid "Het takenonderzoek (traject {})" msgstr "Task-based research: trajectory {}" -#: proposals/utils/validate_proposal.py:179 +#: proposals/utils/validate_proposal.py:180 msgid "Het takenonderzoek: sessie {} (traject {})" msgstr "Task-based research: session {} trajectory {}" -#: proposals/utils/validate_proposal.py:196 +#: proposals/utils/validate_proposal.py:197 msgid "Het takenonderzoek: sessie {} taak {} (traject {})" msgstr "Task-based research: session {} task {} (trajectory {})" -#: proposals/utils/validate_proposal.py:213 +#: proposals/utils/validate_proposal.py:214 msgid "Overzicht van takenonderzoek: sessie {} (traject {})" msgstr "Overview of task-based research: session {} (trajectory {})" -#: proposals/utils/validate_proposal.py:230 +#: proposals/utils/validate_proposal.py:231 msgid "AVG en Data Management" msgstr "AVG and Data Management" @@ -3262,11 +3263,11 @@ msgstr "" msgid "Aanvraag verwijderd" msgstr "Application deleted" -#: proposals/views/proposal_views.py:432 +#: proposals/views/proposal_views.py:452 msgid "Wijzigingen opgeslagen" msgstr "Changes saved" -#: proposals/views/proposal_views.py:532 +#: proposals/views/proposal_views.py:556 msgid "Aanvraag gekopieerd" msgstr "Application copied" @@ -3327,11 +3328,11 @@ msgstr "long route (4-weeks)" msgid "Direct terug naar aanvrager (Nog niet in behandeling)" msgstr "Return directly to applicant (not yet under review)" -#: reviews/forms.py:34 reviews/menus.py:66 reviews/mixins.py:173 +#: reviews/forms.py:34 reviews/menus.py:67 reviews/mixins.py:173 msgid "Algemene Kamer" msgstr "General Chamber" -#: reviews/forms.py:35 reviews/menus.py:76 reviews/mixins.py:176 +#: reviews/forms.py:35 reviews/menus.py:77 reviews/mixins.py:176 msgid "Linguïstiek Kamer" msgstr "Linguistics Chamber" @@ -3363,39 +3364,39 @@ msgstr "Start date period:" msgid "Eind datum periode:" msgstr "End date period:" -#: reviews/menus.py:18 reviews/views.py:73 +#: reviews/menus.py:19 reviews/views.py:73 msgid "Mijn openstaande besluiten" msgstr "My pending decisions" -#: reviews/menus.py:22 +#: reviews/menus.py:23 msgid "Al mijn besluiten" msgstr "All my decisions" -#: reviews/menus.py:26 +#: reviews/menus.py:27 msgid "Alle openstaande besluiten commissieleden" msgstr "All pending decisions committee members" -#: reviews/menus.py:31 +#: reviews/menus.py:32 msgid "Alle openstaande besluiten eindverantwoordelijken" msgstr "All pending decisions supervisors" -#: reviews/menus.py:36 reviews/views.py:230 +#: reviews/menus.py:37 reviews/views.py:230 msgid "Nog af te handelen aanvragen" msgstr "Applications waiting for conclusion" -#: reviews/menus.py:41 reviews/views.py:242 +#: reviews/menus.py:42 reviews/views.py:242 msgid "Aanvragen in revisie" msgstr "Applications in revision" -#: reviews/menus.py:46 reviews/views.py:254 +#: reviews/menus.py:47 reviews/views.py:254 msgid "Alle lopende aanvragen" msgstr "All running applications" -#: reviews/menus.py:51 reviews/views.py:280 +#: reviews/menus.py:52 reviews/views.py:280 msgid "Alle ingezonden aanvragen" msgstr "All submitted applications" -#: reviews/menus.py:56 +#: reviews/menus.py:57 msgid "Overzicht werkverdeling commissieleden" msgstr "Overview workload committee members" @@ -3630,7 +3631,7 @@ msgstr "Long route" msgid "Aanvraag beoordelen" msgstr "Assess the application" -#: reviews/templates/reviews/decision_form.html:22 +#: reviews/templates/reviews/decision_form.html:21 #, python-format msgid "" "Je kunt nu een go of no-go geven voor de aanvraag %(title)s, " @@ -3641,12 +3642,12 @@ msgstr "" "%(refnum)s in %(chamber)s. You can see the details of this application here (downloads as PDF)." -#: reviews/templates/reviews/decision_form.html:30 +#: reviews/templates/reviews/decision_form.html:29 #, python-format msgid "Je kunt nu de aanvraag %(title)s bekijken.
" msgstr "You can now (re)view this application here: %(title)s.
" -#: reviews/templates/reviews/decision_form.html:36 +#: reviews/templates/reviews/decision_form.html:35 msgid "" "Als de aanvraag (incl. geïnformeerde toestemmingsformulieren) in orde is, " "klik dan op ‘goedgekeurd’ en ‘Beslissing opslaan’ hieronder; dan wordt de " @@ -3656,7 +3657,7 @@ msgstr "" "'endorsed' and 'Save decision' below; the application will then be submitted " "to the FEtC-H. " -#: reviews/templates/reviews/decision_form.html:43 +#: reviews/templates/reviews/decision_form.html:42 msgid "" "Als de aanvraag nog niet in orde is, dan zijn er twee mogelijkheden om de " "aanvraag aan te passen:" @@ -3664,7 +3665,7 @@ msgstr "" "If the application is not yet in order, there are two methods to amend the " "study: " -#: reviews/templates/reviews/decision_form.html:50 +#: reviews/templates/reviews/decision_form.html:49 #, python-format msgid "" "door de supervisor (jijzelf)
Als supervisor kan je deze aanvraag Indien je wilt dat de " "indiener de aanvraag zelf aanpast voordat je de studie kunt goedkeuren en " @@ -3692,7 +3693,7 @@ msgstr "" "any comments, and click 'Save decision'. Once you have done this, the " "submitter can make changes again.
" -#: reviews/templates/reviews/decision_form.html:71 +#: reviews/templates/reviews/decision_form.html:70 msgid "" "Als de indiener de gevraagde wijzigingen heeft doorgevoerd en opnieuw heeft " "verstuurd, zal je de aangepaste aanvraag opnieuw moeten beoordelen." @@ -3700,7 +3701,7 @@ msgstr "" "Once the submitter has made the requested changes and resubmitted the " "application, you will have to re-evaluate the application. " -#: reviews/templates/reviews/decision_form.html:81 +#: reviews/templates/reviews/decision_form.html:80 #, python-format msgid "" "Dit is een revisie van of amendement op een vorige aanvraag. De verschillen " @@ -3710,7 +3711,7 @@ msgstr "" "differences compared to the previous application here." -#: reviews/templates/reviews/decision_form.html:96 +#: reviews/templates/reviews/decision_form.html:95 msgid "Beslissing opslaan" msgstr "Save decision" @@ -4185,7 +4186,7 @@ msgstr "Pending decisions committee members" msgid "Openstaande besluiten eindverantwoordelijken" msgstr "Pending decisions supervisors" -#: reviews/views.py:580 +#: reviews/views.py:600 msgid "" "Deze aanvraag is al beoordeeld, dus je kan je beoordeling niet meer " "toevoegen/aanpassen" @@ -5213,17 +5214,3 @@ msgstr "Task edited" #: tasks/views/task_views.py:56 msgid "Taak verwijderd" msgstr "Task deleted" - -#~ msgid "" -#~ "Het reglement van de Algemene Kamer (AK) of dat van de Linguïstiek Kamer " -#~ "(LK)." -#~ msgstr "" -#~ "The regulations of the General Chamber or " -#~ "those of the Linguistics Chamber." - -#~ msgid "Andere betrokkenen" -#~ msgstr "Other people involved" diff --git a/main/templates/base/form_buttons.html b/main/templates/base/form_buttons.html index a3dd2e285..e7cd1ed23 100644 --- a/main/templates/base/form_buttons.html +++ b/main/templates/base/form_buttons.html @@ -11,6 +11,9 @@ {% if proposal.is_pre_assessment %} {% trans "Terug naar begin aanvraag" %} + {% elif proposal.is_pre_approved %} + {% trans "Terug naar begin aanvraag" %} {% elif proposal.is_practice %} diff --git a/proposals/templates/proposals/proposal_confirmation.html b/proposals/templates/proposals/proposal_confirmation.html index 915614cd8..7637fd475 100644 --- a/proposals/templates/proposals/proposal_confirmation.html +++ b/proposals/templates/proposals/proposal_confirmation.html @@ -33,10 +33,10 @@

{% trans "Bevestigingsbrief versturen" %}

{{ form.as_table }}
+ {% trans "Terug naar de vorige pagina" %} - {% trans "Terug naar de vorige pagina" %} diff --git a/proposals/utils/pdf_diff_logic.py b/proposals/utils/pdf_diff_logic.py index ff2489d23..032ba5076 100644 --- a/proposals/utils/pdf_diff_logic.py +++ b/proposals/utils/pdf_diff_logic.py @@ -1103,7 +1103,7 @@ def create_context_diff(context, old_proposal, new_proposal): DiffSection(WMOSection(old_proposal.wmo), WMOSection(new_proposal.wmo)) ) - if new_proposal.is_pre_assessment: + if not new_proposal.is_pre_assessment: if ( new_proposal.wmo.status != new_proposal.wmo.WMOStatuses.NO_WMO or old_proposal.wmo.status != old_proposal.wmo.WMOStatuses.NO_WMO diff --git a/tasks/templates/tasks/session_confirm_delete.html b/tasks/templates/tasks/session_confirm_delete.html index e906e1ecc..f5cbacfbd 100644 --- a/tasks/templates/tasks/session_confirm_delete.html +++ b/tasks/templates/tasks/session_confirm_delete.html @@ -15,11 +15,10 @@

{% trans "Sessie verwijderen" %}

Weet u zeker dat u deze sessie {{ session.order }} in de aanvraag {{ session.study.proposal.title }} wilt verwijderen?

- - {% trans "Annuleren" %} + {% trans "Annuleren" %} diff --git a/tasks/templates/tasks/task_confirm_delete.html b/tasks/templates/tasks/task_confirm_delete.html index c39a183e1..70eb88b56 100644 --- a/tasks/templates/tasks/task_confirm_delete.html +++ b/tasks/templates/tasks/task_confirm_delete.html @@ -15,11 +15,10 @@

{% trans "Taak verwijderen" %}

Weet u zeker dat u de taak {{ task.name }} uit sessie {{ task.session.order }} in de aanvraag {{ task.session.study.proposal.title }} wilt verwijderen?

- - {% trans "Annuleren" %} + {% trans "Annuleren" %}