From 84551b289ba0b09954642dd64ce86fd020c9d77f Mon Sep 17 00:00:00 2001 From: Simona Domnisoru Date: Thu, 25 Jul 2024 15:16:11 +0200 Subject: [PATCH 1/4] Merge master into DHIS2-17516 --- CHANGELOG.md | 21 ++ .../EnrollmentAddEventPageForm.feature | 14 +- .../EnrollmentAddEventPageForm.js | 28 +- .../EnrollmentEditEventPageForm.feature | 4 +- .../EnrollmentEditEventPageForm.js | 23 ++ cypress/e2e/NewPage/NewPage.js | 3 + i18n/ar.po | 81 ++--- i18n/cs.po | 91 +++--- i18n/en.pot | 4 +- i18n/es.po | 117 ++++--- i18n/fr.po | 88 +++--- i18n/id.po | 85 ++--- i18n/lo.po | 97 +++--- i18n/my.po | 296 ++++++++++++++---- i18n/nb.po | 95 +++--- i18n/nl.po | 92 +++--- i18n/pt.po | 91 +++--- i18n/pt_BR.po | 81 ++--- i18n/ro.po | 87 ++--- i18n/ru.po | 102 +++--- i18n/tg.po | 89 +++--- i18n/uk.po | 81 ++--- i18n/ur.po | 77 +++-- i18n/vi.po | 83 ++--- i18n/zh.po | 91 +++--- i18n/zh_CN.po | 95 +++--- package.json | 4 +- packages/rules-engine/package.json | 2 +- .../DataEntry/helpers/convertClientToView.js | 4 +- .../RelatedStagesActions.component.js | 2 +- .../hooks/useAvailableRelatedStageEvents.js | 16 +- 31 files changed, 1233 insertions(+), 811 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a30c7961a6..361f5cad95 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,24 @@ +## [100.70.14](https://github.com/dhis2/capture-app/compare/v100.70.13...v100.70.14) (2024-07-24) + + +### Bug Fixes + +* **translations:** sync translations from transifex (master) ([2af3de0](https://github.com/dhis2/capture-app/commit/2af3de039dd7e330c34810c398ecb0df23c5a4b1)) + +## [100.70.13](https://github.com/dhis2/capture-app/compare/v100.70.12...v100.70.13) (2024-07-23) + + +### Bug Fixes + +* [DHIS2-15687] display translated options in profile widget ([#3717](https://github.com/dhis2/capture-app/issues/3717)) ([54e5582](https://github.com/dhis2/capture-app/commit/54e5582bfcf3dbaf67c1e18ac2cf48953fedb22c)) + +## [100.70.12](https://github.com/dhis2/capture-app/compare/v100.70.11...v100.70.12) (2024-07-18) + + +### Bug Fixes + +* [DHIS2-17653] Exclude Linked Events from Dropdown List in Actions Widget ([#3697](https://github.com/dhis2/capture-app/issues/3697)) ([305623e](https://github.com/dhis2/capture-app/commit/305623ef19b512b0ffc9f97d5824129b3b4484c0)) + ## [100.70.11](https://github.com/dhis2/capture-app/compare/v100.70.10...v100.70.11) (2024-07-15) diff --git a/cypress/e2e/EnrollmentAddEventPage/EnrollmentAddEventPageForm/EnrollmentAddEventPageForm.feature b/cypress/e2e/EnrollmentAddEventPage/EnrollmentAddEventPageForm/EnrollmentAddEventPageForm.feature index f7707228cd..47bacdbe8a 100644 --- a/cypress/e2e/EnrollmentAddEventPage/EnrollmentAddEventPageForm/EnrollmentAddEventPageForm.feature +++ b/cypress/e2e/EnrollmentAddEventPage/EnrollmentAddEventPageForm/EnrollmentAddEventPageForm.feature @@ -1,7 +1,5 @@ Feature: User interacts with the Enrollment New Event Workspace - # DHIS2-17657 - @skip Scenario: User can complete a Lab monitoring Event Given you land on the enrollment new event page by having typed /#/enrollment?programId=ur1Edk5Oe2n&orgUnitId=DiszpKrYNg8&teiId=yGIeBkYzW2o&enrollmentId=Pm0VlgHBgRm And the enrollment overview is finished loading @@ -12,9 +10,8 @@ Feature: User interacts with the Enrollment New Event Workspace And you click the Complete button Then all events should be displayed And the newest event in datatable nr 0 should contain Completed + And the events in Lab monitoring are deleted - # DHIS2-17657 - @skip Scenario: User can save a Sputum smear microscopy test without completing Given you land on the enrollment new event page by having typed /#/enrollment?programId=ur1Edk5Oe2n&orgUnitId=DiszpKrYNg8&teiId=yGIeBkYzW2o&enrollmentId=Pm0VlgHBgRm And the enrollment overview is finished loading @@ -24,9 +21,10 @@ Feature: User interacts with the Enrollment New Event Workspace And the user selects Positive And you click the Save without completing button Then all events should be displayed - And the newest event in datatable nr 2 should contain Active - And the newest event in datatable nr 2 should contain 13 - And the newest event in datatable nr 2 should contain Positive + And the newest event in datatable nr 1 should contain Active + And the newest event in datatable nr 1 should contain 13 + And the newest event in datatable nr 1 should contain Positive + And the events in Sputum smear microscopy are deleted Scenario: Required fields should display an error when saving without data Given you land on the enrollment new event page by having typed /#/enrollment?programId=ur1Edk5Oe2n&orgUnitId=DiszpKrYNg8&teiId=yGIeBkYzW2o&enrollmentId=Pm0VlgHBgRm @@ -87,6 +85,6 @@ Feature: User interacts with the Enrollment New Event Workspace And the enrollment status is active And you type 2021-10-15 in the input number 0 And you select Died in the select number 0 - And the user completes the event + And you click the Complete button And the user completes the enrollment Then the user sees the enrollment status and recently added event in Case outcome event status is completed diff --git a/cypress/e2e/EnrollmentAddEventPage/EnrollmentAddEventPageForm/EnrollmentAddEventPageForm.js b/cypress/e2e/EnrollmentAddEventPage/EnrollmentAddEventPageForm/EnrollmentAddEventPageForm.js index aa9d7b88ad..f3a2d9f851 100644 --- a/cypress/e2e/EnrollmentAddEventPage/EnrollmentAddEventPageForm/EnrollmentAddEventPageForm.js +++ b/cypress/e2e/EnrollmentAddEventPage/EnrollmentAddEventPageForm/EnrollmentAddEventPageForm.js @@ -197,12 +197,18 @@ And('the enrollment status is active', () => { changeEnrollmentAndEventsStatus(); }); -And('the user completes the event', () => { +And('you click the Complete button', () => { cy.get('[data-test="dhis2-uicore-button"]') .contains('Complete') .click(); }); +And('you click the Save without completing button', () => { + cy.get('[data-test="dhis2-uicore-button"]') + .contains('Save without completing') + .click(); +}); + When('the user completes the enrollment', () => { cy.get('[data-test="enrollment-complete-modal"]').within(() => { cy.contains('Case outcome completed').should('exist'); @@ -230,3 +236,23 @@ Then('the user sees the enrollment status and recently added event in Case outco }); changeEnrollmentAndEventsStatus(); }); + +And(/^the events in (.*) are deleted$/, (name) => { + const programStages = [ + { name: 'Lab monitoring', id: 'EPEcjy3FWmI' }, + { name: 'Sputum smear microscopy', id: 'jdRD35YwbRH' }, + ]; + const programStage = programStages.find(e => e.name === name); + + cy.buildApiUrl('tracker', 'enrollments/Pm0VlgHBgRm?fields=events[programStage,event]') + .then(url => cy.request(url)) + .then(({ body }) => { + const eventsToDelete = body.events.filter(e => e.programStage === programStage.id); + + if (eventsToDelete) { + cy.buildApiUrl('tracker?async=false&importStrategy=DELETE').then((eventUrl) => { + cy.request('POST', eventUrl, { events: eventsToDelete }); + }); + } + }); +}); diff --git a/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.feature b/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.feature index e1b4555a76..72271b0594 100644 --- a/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.feature +++ b/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.feature @@ -51,12 +51,10 @@ Then the user see the following text: Low-dose acetylsalicylic acid given When the user sets Plurality assessed to Singleton Then the user don't see the following text: Low-dose acetylsalicylic acid given -# DHIS2-17730 -@skip Scenario: User can modify and save the data in the form Given you land on the enrollment event page with selected Person by having typed /#/enrollmentEventEdit?orgUnitId=DiszpKrYNg8&eventId=V1CerIi3sdL Then the user see the following text: Enrollment: View Event -And the user see the following text: 11 +And the apgar score is 11 When the user clicks on the edit button And the user set the apgar score to 5 And the user clicks on the save button diff --git a/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.js b/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.js index 622e032d7f..bd82268d44 100644 --- a/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.js +++ b/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.js @@ -28,6 +28,29 @@ const changeEnrollmentAndEventsStatus = () => ( }) ); +And('the apgar score is 11', () => { + cy.buildApiUrl('tracker', 'events/V1CerIi3sdL') + .then(url => cy.request(url)) + .then(({ body }) => { + const { dataValues, ...rest } = body; + const dataValuesToUpdate = dataValues.map(dataValue => ( + dataValue.dataElement === 'a3kGcGDCuk6' ? { ...dataValue, value: 11 } : dataValue + )); + const eventToUpdate = { ...rest, dataValues: dataValuesToUpdate }; + + return cy + .buildApiUrl('tracker?async=false&importStrategy=UPDATE') + .then(url => cy.request('POST', url, { events: [eventToUpdate] })) + .then(() => { + cy.reload(); + cy.get('[data-test="widget-enrollment-event"]') + .find('[data-test="form-field"]') + .contains('11') + .should('exist'); + }); + }); +}); + Given(/^you land on the enrollment event page with selected (.*) by having typed (.*)$/, (tet, url) => { cy.visit(url); cy.get('[data-test="scope-selector"]').contains(`${tet}`); diff --git a/cypress/e2e/NewPage/NewPage.js b/cypress/e2e/NewPage/NewPage.js index d6d23d64bf..de6efe53e2 100644 --- a/cypress/e2e/NewPage/NewPage.js +++ b/cypress/e2e/NewPage/NewPage.js @@ -427,6 +427,9 @@ Then('you submit the form again from the duplicates modal', () => { // New person in WHO RMNCH Tracker And('you are in the WHO RMNCH program registration page', () => { cy.visit('/#/new?programId=WSGAb5XwJ3Y&orgUnitId=DiszpKrYNg8'); + cy.get('[data-test="capture-ui-input"]') + .eq(1) + .invoke('val').should('not.be.empty'); }); And('you are in Child programme registration page', () => { diff --git a/i18n/ar.po b/i18n/ar.po index b9af9c14ac..7f2ddfb0a8 100644 --- a/i18n/ar.po +++ b/i18n/ar.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-04-12T20:48:54.429Z\n" +"POT-Creation-Date: 2024-06-28T11:23:02.970Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Viktor Varland , 2024\n" "Language-Team: Arabic (https://app.transifex.com/hisp-uio/teams/100509/ar/)\n" @@ -198,15 +198,15 @@ msgstr "المستخدم المعين" msgid "Search for user" msgstr "البحث عن مستخدم" +msgid "Notes" +msgstr "" + msgid "Basic info" msgstr "المعلومات الأساسية" msgid "Status" msgstr "الحالة" -msgid "Comments" -msgstr "التعليقات" - msgid "Relationships" msgstr "علاقات" @@ -238,8 +238,8 @@ msgstr "النشطة" msgid "Completed" msgstr "مكتمل" -msgid "Please add or cancel comment before saving the event" -msgstr "يرجى إضافة أو إلغاء التعليق قبل حفظ الحدث" +msgid "Please add or cancel note before saving the event" +msgstr "" msgid "Save and add another" msgstr "حفظ واضافة جديد" @@ -626,14 +626,14 @@ msgstr "غير متصل" msgid "Syncing" msgstr "تزامن" -msgid "Add comment" -msgstr "اضافة تعليق" +msgid "Add note" +msgstr "أضف ملاحظة" -msgid "You don't have access to write comments" +msgid "You don't have access to write notes" msgstr "" -msgid "Write comment" -msgstr "اكتب تعليقاً" +msgid "Write note" +msgstr "" msgid "was blanked out and hidden by your last action" msgstr "" @@ -830,8 +830,10 @@ msgstr "" msgid "Please select an organisation unit." msgstr "" -msgid "New" -msgstr "جديد" +msgid "" +"You don't have access to create a {{trackedEntityName}} in the current " +"selections" +msgstr "" msgid "Choose the {{missingCategories}} to start reporting" msgstr "" @@ -839,8 +841,8 @@ msgstr "" msgid "Save as new" msgstr "" -msgid "View enrollment" -msgstr "" +msgid "New" +msgstr "جديد" msgid "Create for" msgstr "" @@ -1148,9 +1150,6 @@ msgid "" "program. All activity will be logged." msgstr "" -msgid "Save comment" -msgstr "حفظ التعليق" - msgid "Enrollment actions" msgstr "" @@ -1270,22 +1269,25 @@ msgstr "" msgid "Add area" msgstr "" -msgid "Comments about this enrollment" +msgid "Please add or cancel the note before saving the event" msgstr "" -msgid "Write a comment about this enrollment" +msgid "organisation unit could not be retrieved. Please try again later." msgstr "" -msgid "This enrollment doesn't have any comments" +msgid "Saving to {{stageName}} for {{programName}} in {{orgUnitName}}" msgstr "" -msgid "organisation unit could not be retrieved. Please try again later." +msgid "program or stage is invalid" msgstr "" -msgid "Saving to {{stageName}} for {{programName}} in {{orgUnitName}}" +msgid "Notes about this enrollment" msgstr "" -msgid "program or stage is invalid" +msgid "Write a note about this enrollment" +msgstr "" + +msgid "This enrollment doesn't have any notes" msgstr "" msgid "Error" @@ -1294,15 +1296,6 @@ msgstr "خطأ" msgid "Warning" msgstr "تحذير" -msgid "Comments about this event" -msgstr "" - -msgid "Write a comment about this event" -msgstr "" - -msgid "This event doesn't have any comments" -msgstr "" - msgid "stage not found in rules execution" msgstr "" @@ -1324,6 +1317,15 @@ msgstr "الحدث مكتمل" msgid "Back to all stages and events" msgstr "" +msgid "Notes about this event" +msgstr "" + +msgid "Write a note about this event" +msgstr "" + +msgid "This event doesn't have any notes" +msgstr "" + msgid "Schedule date info" msgstr "" @@ -1370,12 +1372,15 @@ msgstr "" msgid "Schedule date / Due date" msgstr "" -msgid "Event comments" +msgid "Event notes" msgstr "" -msgid "Write a comment about this scheduled event" +msgid "Write a note about this scheduled event" msgstr "" +msgid "Save note" +msgstr "حفظ ملاحظة" + msgid "" "Change information about this {{trackedEntityName}} here. To change " "information about this enrollment, use the Edit button in the in the " @@ -1439,6 +1444,12 @@ msgstr "" msgid "Choose a {{linkableStageLabel}}" msgstr "" +msgid "{{ linkableStageLabel }} is not repeatable" +msgstr "" + +msgid "{{ linkableStageLabel }} has no linkable events" +msgstr "" + msgid "Ambiguous relationships, contact system administrator" msgstr "" diff --git a/i18n/cs.po b/i18n/cs.po index 9e2004f56d..33fa4ce4fd 100644 --- a/i18n/cs.po +++ b/i18n/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-04-12T20:48:54.429Z\n" +"POT-Creation-Date: 2024-06-28T11:23:02.970Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Jiří Podhorecký, 2024\n" "Language-Team: Czech (https://app.transifex.com/hisp-uio/teams/100509/cs/)\n" @@ -196,15 +196,15 @@ msgstr "Přiřazený uživatel" msgid "Search for user" msgstr "Hledat uživatele" +msgid "Notes" +msgstr "" + msgid "Basic info" msgstr "Základní informace" msgid "Status" msgstr "Stav" -msgid "Comments" -msgstr "Komentáře" - msgid "Relationships" msgstr "Vztahy" @@ -235,8 +235,8 @@ msgstr "Aktivní" msgid "Completed" msgstr "Dokončeno" -msgid "Please add or cancel comment before saving the event" -msgstr "Před uložením události prosím přidejte nebo zrušte komentář" +msgid "Please add or cancel note before saving the event" +msgstr "" msgid "Save and add another" msgstr "Uložit a přidat další" @@ -628,14 +628,14 @@ msgstr "Offline" msgid "Syncing" msgstr "Probíhá synchronizace" -msgid "Add comment" -msgstr "Přidat komentář" +msgid "Add note" +msgstr "Přidat poznámku" -msgid "You don't have access to write comments" -msgstr "Nemáte přístup k psaní komentářů" +msgid "You don't have access to write notes" +msgstr "" -msgid "Write comment" -msgstr "Napsat komentář" +msgid "Write note" +msgstr "" msgid "was blanked out and hidden by your last action" msgstr "byla vymazána a skryta vaší poslední akcí" @@ -850,8 +850,10 @@ msgstr "Nebo zobrazit všechny události, které máte k dispozici v {{program}} msgid "Please select an organisation unit." msgstr "Vyberte organizační jednotku." -msgid "New" -msgstr "Nový" +msgid "" +"You don't have access to create a {{trackedEntityName}} in the current " +"selections" +msgstr "" msgid "Choose the {{missingCategories}} to start reporting" msgstr "Chcete-li zahájit vytváření hlášení, vyberte {{missingCategories}}" @@ -859,8 +861,8 @@ msgstr "Chcete-li zahájit vytváření hlášení, vyberte {{missingCategories} msgid "Save as new" msgstr "Uložit jako nové" -msgid "View enrollment" -msgstr "Zobrazit zápis" +msgid "New" +msgstr "Nový" msgid "Create for" msgstr "Vytvořit pro" @@ -1178,9 +1180,6 @@ msgstr "" "Pro kontrolu zápisů v tomto chráněném programu musíte uvést důvod. Veškerá " "aktivita bude zaznamenána." -msgid "Save comment" -msgstr "Uložit komentář" - msgid "Enrollment actions" msgstr "Akce zápisu" @@ -1303,14 +1302,8 @@ msgstr "Přidat souřadnice" msgid "Add area" msgstr "Přidat oblast" -msgid "Comments about this enrollment" -msgstr "Komentáře k tomuto zápisu" - -msgid "Write a comment about this enrollment" -msgstr "Napište komentář k tomuto zápisu" - -msgid "This enrollment doesn't have any comments" -msgstr "Tento zápis nemá žádné komentáře" +msgid "Please add or cancel the note before saving the event" +msgstr "" msgid "organisation unit could not be retrieved. Please try again later." msgstr "organizační jednotku nelze načíst. Zkuste to znovu později." @@ -1321,21 +1314,21 @@ msgstr "Ukládání do {{stageName}} pro {{programName}} v {{orgUnitName}}" msgid "program or stage is invalid" msgstr "program nebo fáze je neplatná" +msgid "Notes about this enrollment" +msgstr "" + +msgid "Write a note about this enrollment" +msgstr "" + +msgid "This enrollment doesn't have any notes" +msgstr "" + msgid "Error" msgstr "Chyba" msgid "Warning" msgstr "Varování" -msgid "Comments about this event" -msgstr "Komentáře k této události" - -msgid "Write a comment about this event" -msgstr "Napište komentář k této události" - -msgid "This event doesn't have any comments" -msgstr "Tato událost nemá žádné komentáře" - msgid "stage not found in rules execution" msgstr "fáze nebyla nalezena v provádění pravidel" @@ -1357,6 +1350,15 @@ msgstr "Událost dokončena" msgid "Back to all stages and events" msgstr "Zpět ke všem fázím a událostem" +msgid "Notes about this event" +msgstr "" + +msgid "Write a note about this event" +msgstr "" + +msgid "This event doesn't have any notes" +msgstr "" + msgid "Schedule date info" msgstr "Informace o termínu" @@ -1405,11 +1407,14 @@ msgstr "Informace o rozvrhu" msgid "Schedule date / Due date" msgstr "Datum plánu / Datum konce platnosti" -msgid "Event comments" -msgstr "Komentáře k události" +msgid "Event notes" +msgstr "" + +msgid "Write a note about this scheduled event" +msgstr "" -msgid "Write a comment about this scheduled event" -msgstr "Napište komentář k této plánované akci" +msgid "Save note" +msgstr "Uložit poznámku" msgid "" "Change information about this {{trackedEntityName}} here. To change " @@ -1477,6 +1482,12 @@ msgstr "" msgid "Choose a {{linkableStageLabel}}" msgstr "" +msgid "{{ linkableStageLabel }} is not repeatable" +msgstr "" + +msgid "{{ linkableStageLabel }} has no linkable events" +msgstr "" + msgid "Ambiguous relationships, contact system administrator" msgstr "" diff --git a/i18n/en.pot b/i18n/en.pot index 4184b241b2..abaccb285f 100644 --- a/i18n/en.pot +++ b/i18n/en.pot @@ -1464,8 +1464,8 @@ msgstr "Choose a {{linkableStageLabel}}" msgid "{{ linkableStageLabel }} is not repeatable" msgstr "{{ linkableStageLabel }} is not repeatable" -msgid "{{ linkableStageLabel }} has no existing events" -msgstr "{{ linkableStageLabel }} has no existing events" +msgid "{{ linkableStageLabel }} has no linkable events" +msgstr "{{ linkableStageLabel }} has no linkable events" msgid "Ambiguous relationships, contact system administrator" msgstr "Ambiguous relationships, contact system administrator" diff --git a/i18n/es.po b/i18n/es.po index 7fc9050e29..26f5b6985f 100644 --- a/i18n/es.po +++ b/i18n/es.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-04-12T20:48:54.429Z\n" +"POT-Creation-Date: 2024-06-28T11:23:02.970Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Viktor Varland , 2024\n" "Language-Team: Spanish (https://app.transifex.com/hisp-uio/teams/100509/es/)\n" @@ -210,15 +210,15 @@ msgstr "Usuario asignado" msgid "Search for user" msgstr "Buscar usuario" +msgid "Notes" +msgstr "" + msgid "Basic info" msgstr "Información básica" msgid "Status" msgstr "Estado" -msgid "Comments" -msgstr "Comentarios" - msgid "Relationships" msgstr "Relaciones" @@ -250,8 +250,8 @@ msgstr "Activo" msgid "Completed" msgstr "Completado" -msgid "Please add or cancel comment before saving the event" -msgstr "Agregue o cancele el comentario antes de guardar el evento" +msgid "Please add or cancel note before saving the event" +msgstr "" msgid "Save and add another" msgstr "Guardar y agregar otro" @@ -636,6 +636,8 @@ msgstr "El programa no existe" msgid "Selected program is invalid for selected organisation unit" msgstr "" +"El programa seleccionado no es válido para la unidad organizativa " +"seleccionada" msgid "Online" msgstr "Conectado" @@ -646,14 +648,14 @@ msgstr "Desconectado" msgid "Syncing" msgstr "Sincronizando" -msgid "Add comment" -msgstr "Agregar comentario" +msgid "Add note" +msgstr "Añadir nota" -msgid "You don't have access to write comments" -msgstr "No tiene acceso para escribir comentarios." +msgid "You don't have access to write notes" +msgstr "" -msgid "Write comment" -msgstr "Escribir comentario" +msgid "Write note" +msgstr "" msgid "was blanked out and hidden by your last action" msgstr "fue borrado y oculto por tu última acción" @@ -822,7 +824,7 @@ msgid "There was an error loading the page" msgstr "Hubo un error al cargar la página" msgid "Choose an organisation unit to start reporting" -msgstr "" +msgstr "Elija una unidad organizativa para empezar a informar" msgid "No feedback for this event yet" msgstr "Aún no hay retroalimentación para este evento." @@ -872,8 +874,12 @@ msgstr "O vea todos los eventos a los que puede acceder en {{program}}" msgid "Please select an organisation unit." msgstr "Seleccione una unidad organizativa." -msgid "New" -msgstr "Nuevo" +msgid "" +"You don't have access to create a {{trackedEntityName}} in the current " +"selections" +msgstr "" +"Usted no tiene acceso para crear un {{trackedEntityName}} en las selecciones" +" actuales" msgid "Choose the {{missingCategories}} to start reporting" msgstr "Elija los {{missingCategories}} para comenzar a informar" @@ -881,8 +887,8 @@ msgstr "Elija los {{missingCategories}} para comenzar a informar" msgid "Save as new" msgstr "Guardar como nuevo" -msgid "View enrollment" -msgstr "Ver inscripción" +msgid "New" +msgstr "Nuevo" msgid "Create for" msgstr "Crear" @@ -1037,7 +1043,7 @@ msgid "No results found for " msgstr "No se encontraron resultados para" msgid "Choose an organisation unit" -msgstr "" +msgstr "Elija una unidad organizativa" msgid "Clear selection" msgstr "Despejar selecciones" @@ -1050,6 +1056,7 @@ msgstr "Buscar un programa" msgid "Some programs are being filtered by the chosen organisation unit" msgstr "" +"Algunos programas están siendo filtrados por la unidad organizativa elegida" msgid "Show all programs" msgstr "Mostrar todos los programas" @@ -1165,7 +1172,7 @@ msgid "Search for a {{trackedEntityName}} in {{programName}}" msgstr "Buscar un(a) {{trackedEntityName}} en {{programName}}" msgid "No tracked entity types available" -msgstr "" +msgstr "No hay tipos de entidades rastreadas disponibles" msgid "Assigned to" msgstr "Asignado a" @@ -1208,9 +1215,6 @@ msgstr "" "Debe proporcionar una razón para ver inscripciones en este programa " "protegido. Toda actividad será registrada en el log." -msgid "Save comment" -msgstr "Guardar comentario" - msgid "Enrollment actions" msgstr "Acciones de inscripción" @@ -1339,14 +1343,8 @@ msgstr "Establecer coordenadas" msgid "Add area" msgstr "Agregar área" -msgid "Comments about this enrollment" -msgstr "Comentarios sobre esta inscripción" - -msgid "Write a comment about this enrollment" -msgstr "Escribe un comentario sobre esta inscripción" - -msgid "This enrollment doesn't have any comments" -msgstr "Esta inscripción no tiene comentarios" +msgid "Please add or cancel the note before saving the event" +msgstr "" msgid "organisation unit could not be retrieved. Please try again later." msgstr "" @@ -1359,21 +1357,21 @@ msgstr "Guardando en {{stageName}} para {{programName}} en {{orgUnitName}}" msgid "program or stage is invalid" msgstr "el programa o la etapa no es válido" +msgid "Notes about this enrollment" +msgstr "" + +msgid "Write a note about this enrollment" +msgstr "" + +msgid "This enrollment doesn't have any notes" +msgstr "" + msgid "Error" msgstr "Error" msgid "Warning" msgstr "Advertencia" -msgid "Comments about this event" -msgstr "Comentarios sobre este evento" - -msgid "Write a comment about this event" -msgstr "Escriba un comentario sobre este evento" - -msgid "This event doesn't have any comments" -msgstr "Este evento no tiene comentarios." - msgid "stage not found in rules execution" msgstr "etapa no encontrada en la ejecución de reglas" @@ -1396,6 +1394,15 @@ msgstr "Evento completado" msgid "Back to all stages and events" msgstr "Volver a todas las etapas y eventos" +msgid "Notes about this event" +msgstr "" + +msgid "Write a note about this event" +msgstr "" + +msgid "This event doesn't have any notes" +msgstr "" + msgid "Schedule date info" msgstr "Programar información de fecha" @@ -1445,11 +1452,14 @@ msgstr "Programar información" msgid "Schedule date / Due date" msgstr "Fecha de programación/fecha de vencimiento" -msgid "Event comments" -msgstr "Comentarios del evento" +msgid "Event notes" +msgstr "" -msgid "Write a comment about this scheduled event" -msgstr "Escriba un comentario sobre este evento programado" +msgid "Write a note about this scheduled event" +msgstr "" + +msgid "Save note" +msgstr "Guardar Nota" msgid "" "Change information about this {{trackedEntityName}} here. To change " @@ -1519,21 +1529,30 @@ msgid "tracked entity instance" msgstr "instancia de entidad rastreada" msgid "Link to an existing {{linkableStageLabel}}" -msgstr "" +msgstr "Enlace a un {{linkableStageLabel}}" msgid "Choose a {{linkableStageLabel}}" +msgstr "Elija una {{linkableStageLabel}}" + +msgid "{{ linkableStageLabel }} is not repeatable" +msgstr "" + +msgid "{{ linkableStageLabel }} has no linkable events" msgstr "" msgid "Ambiguous relationships, contact system administrator" msgstr "" +"Relaciones ambiguas, póngase en contacto con el administrador del sistema" msgid "" "Enter {{linkableStageLabel}} details in the next step after completing this " "{{currentStageLabel}}." msgstr "" +"Introduzca los detalles de {{linkableStageLabel}} en el siguiente paso " +"después de completar este {{currentStageLabel}}." msgid "Enter details now" -msgstr "" +msgstr "Introducir datos ahora" msgid "Link to an existing" msgstr "" @@ -1545,7 +1564,7 @@ msgid "Report date" msgstr "Fecha de reporte" msgid "Please select a valid event" -msgstr "" +msgstr "Seleccione un evento válido" msgid "New {{ eventName }} event" msgstr "Nuevo evento {{ eventName }}" @@ -1572,9 +1591,9 @@ msgstr "" msgid "{{ count }} event" msgid_plural "{{ count }} event" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "{{ count }} evento" +msgstr[1] "{{count}} eventos" +msgstr[2] "{{count}} eventos" msgid "{{ overdueEvents }} overdue" msgstr "{{ overdueEvents }} atrasado(s)" diff --git a/i18n/fr.po b/i18n/fr.po index 63f3d2b8e4..e5d7b03ca5 100644 --- a/i18n/fr.po +++ b/i18n/fr.po @@ -7,16 +7,16 @@ # Edem Kossi , 2024 # Gabriela Rodriguez , 2024 # Yayra Gomado , 2024 -# Viktor Varland , 2024 # Yao Selom SAKA (HISP WCA) , 2024 # Elise Desailly, 2024 +# Viktor Varland , 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-04-12T20:48:54.429Z\n" +"POT-Creation-Date: 2024-06-28T11:23:02.970Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" -"Last-Translator: Elise Desailly, 2024\n" +"Last-Translator: Viktor Varland , 2024\n" "Language-Team: French (https://app.transifex.com/hisp-uio/teams/100509/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -210,15 +210,15 @@ msgstr "Utilisateur affecté" msgid "Search for user" msgstr "Rechercher un utilisateur" +msgid "Notes" +msgstr "" + msgid "Basic info" msgstr "Infos de base" msgid "Status" msgstr "Statut" -msgid "Comments" -msgstr "Commentaires" - msgid "Relationships" msgstr "Relations" @@ -251,10 +251,8 @@ msgstr "Actif" msgid "Completed" msgstr "Terminé" -msgid "Please add or cancel comment before saving the event" +msgid "Please add or cancel note before saving the event" msgstr "" -"Veuillez ajouter ou annuler un commentaire avant avant d'enregistrer " -"l'événement" msgid "Save and add another" msgstr "Sauvegarder et ajouter nouveau" @@ -649,14 +647,14 @@ msgstr "Hors ligne" msgid "Syncing" msgstr "Synchronisation" -msgid "Add comment" -msgstr "Ajouter commentaire" +msgid "Add note" +msgstr "Ajouter une note" -msgid "You don't have access to write comments" -msgstr "Vous n'êtes pas autorisé à écrire des commentaires" +msgid "You don't have access to write notes" +msgstr "" -msgid "Write comment" -msgstr "Ecrire commentaire" +msgid "Write note" +msgstr "" msgid "was blanked out and hidden by your last action" msgstr "" @@ -876,9 +874,6 @@ msgstr "Choisir le {{missingCategories}} pour commencer à rapporter" msgid "Save as new" msgstr "Enregistrer comme nouveau" -msgid "View enrollment" -msgstr "Afficher l'inscription" - msgid "New" msgstr "Nouveau" @@ -1200,9 +1195,6 @@ msgid "" "program. All activity will be logged." msgstr "" -msgid "Save comment" -msgstr "Enregistrer commentaires " - msgid "Enrollment actions" msgstr "Actions d'enrôlement" @@ -1325,14 +1317,8 @@ msgstr "Ajouter des coordonnées" msgid "Add area" msgstr "Ajouter une zone" -msgid "Comments about this enrollment" -msgstr "Commentaires sur cette inscription" - -msgid "Write a comment about this enrollment" -msgstr "Écrire un commentaire sur cette inscription" - -msgid "This enrollment doesn't have any comments" -msgstr "Cette inscription n'a pas de commentaires" +msgid "Please add or cancel the note before saving the event" +msgstr "" msgid "organisation unit could not be retrieved. Please try again later." msgstr "" @@ -1345,21 +1331,21 @@ msgstr "Sauvegarde à {{stageName}} pour {{programName}} dans {{orgUnitName}}" msgid "program or stage is invalid" msgstr "programme ou stade invalide" +msgid "Notes about this enrollment" +msgstr "" + +msgid "Write a note about this enrollment" +msgstr "" + +msgid "This enrollment doesn't have any notes" +msgstr "" + msgid "Error" msgstr "Erreur" msgid "Warning" msgstr "Attention" -msgid "Comments about this event" -msgstr "Commentaires sur cet événement" - -msgid "Write a comment about this event" -msgstr "Écrire un commentaire sur cet événement" - -msgid "This event doesn't have any comments" -msgstr "Cet événement n'a pas de commentaires" - msgid "stage not found in rules execution" msgstr "stade non trouvé lors de l'exécution des règles" @@ -1383,6 +1369,15 @@ msgstr "Événement terminé" msgid "Back to all stages and events" msgstr "Retour à tous les stades et événements" +msgid "Notes about this event" +msgstr "" + +msgid "Write a note about this event" +msgstr "" + +msgid "This event doesn't have any notes" +msgstr "" + msgid "Schedule date info" msgstr "Info sur la date prévue" @@ -1427,11 +1422,14 @@ msgstr "Informations sur la programmation" msgid "Schedule date / Due date" msgstr "Date prévue / Date d'échéance" -msgid "Event comments" -msgstr "Commentaires sur l'événement" +msgid "Event notes" +msgstr "" + +msgid "Write a note about this scheduled event" +msgstr "" -msgid "Write a comment about this scheduled event" -msgstr "Écrire un commentaire sur cet événement planifié" +msgid "Save note" +msgstr "Enregistrer note" msgid "" "Change information about this {{trackedEntityName}} here. To change " @@ -1507,6 +1505,12 @@ msgstr "" msgid "Choose a {{linkableStageLabel}}" msgstr "" +msgid "{{ linkableStageLabel }} is not repeatable" +msgstr "" + +msgid "{{ linkableStageLabel }} has no linkable events" +msgstr "" + msgid "Ambiguous relationships, contact system administrator" msgstr "" diff --git a/i18n/id.po b/i18n/id.po index b13341ade2..25eb894ad7 100644 --- a/i18n/id.po +++ b/i18n/id.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-04-12T20:48:54.429Z\n" +"POT-Creation-Date: 2024-06-28T11:23:02.970Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Viktor Varland , 2024\n" "Language-Team: Indonesian (https://app.transifex.com/hisp-uio/teams/100509/id/)\n" @@ -205,15 +205,15 @@ msgstr "Pengguna yang ditetapkan" msgid "Search for user" msgstr "Cari pengguna" +msgid "Notes" +msgstr "Catatan" + msgid "Basic info" msgstr "Info dasar" msgid "Status" msgstr "Status" -msgid "Comments" -msgstr "Komentar" - msgid "Relationships" msgstr "Hubungan" @@ -245,8 +245,8 @@ msgstr "Aktif" msgid "Completed" msgstr "Selesai" -msgid "Please add or cancel comment before saving the event" -msgstr "Silakan tambahkan atau batalkan komentar sebelum menyimpan even" +msgid "Please add or cancel note before saving the event" +msgstr "" msgid "Save and add another" msgstr "Simpan dan tambahkan yang lain" @@ -633,14 +633,14 @@ msgstr "Offline" msgid "Syncing" msgstr "Menyinkronkan" -msgid "Add comment" -msgstr "Tambahkan komentar" +msgid "Add note" +msgstr "Tambah catatan" -msgid "You don't have access to write comments" +msgid "You don't have access to write notes" msgstr "" -msgid "Write comment" -msgstr "Tulis komentar" +msgid "Write note" +msgstr "" msgid "was blanked out and hidden by your last action" msgstr "" @@ -842,8 +842,10 @@ msgstr "" msgid "Please select an organisation unit." msgstr "" -msgid "New" -msgstr "Baru" +msgid "" +"You don't have access to create a {{trackedEntityName}} in the current " +"selections" +msgstr "" msgid "Choose the {{missingCategories}} to start reporting" msgstr "Pilih {{missingCategories}} untuk mulai melaporkan" @@ -851,8 +853,8 @@ msgstr "Pilih {{missingCategories}} untuk mulai melaporkan" msgid "Save as new" msgstr "Simpan sebagai baru" -msgid "View enrollment" -msgstr "Lihat pendaftaran" +msgid "New" +msgstr "Baru" msgid "Create for" msgstr "Buat untuk" @@ -1162,9 +1164,6 @@ msgid "" "program. All activity will be logged." msgstr "" -msgid "Save comment" -msgstr "Simpan komentar" - msgid "Enrollment actions" msgstr "Tindakan pendaftaran" @@ -1286,14 +1285,8 @@ msgstr "" msgid "Add area" msgstr "" -msgid "Comments about this enrollment" -msgstr "Komentar tentang pendaftaran ini" - -msgid "Write a comment about this enrollment" -msgstr "Tulis sebuah komentar tentang pendaftaran ini" - -msgid "This enrollment doesn't have any comments" -msgstr "Pendaftaran ini tidak memiliki komentar" +msgid "Please add or cancel the note before saving the event" +msgstr "" msgid "organisation unit could not be retrieved. Please try again later." msgstr "" @@ -1304,21 +1297,21 @@ msgstr "" msgid "program or stage is invalid" msgstr "" -msgid "Error" -msgstr "Error" - -msgid "Warning" -msgstr "Peringatan" - -msgid "Comments about this event" +msgid "Notes about this enrollment" msgstr "" -msgid "Write a comment about this event" +msgid "Write a note about this enrollment" msgstr "" -msgid "This event doesn't have any comments" +msgid "This enrollment doesn't have any notes" msgstr "" +msgid "Error" +msgstr "Error" + +msgid "Warning" +msgstr "Peringatan" + msgid "stage not found in rules execution" msgstr "" @@ -1340,6 +1333,15 @@ msgstr "Even selesai" msgid "Back to all stages and events" msgstr "" +msgid "Notes about this event" +msgstr "" + +msgid "Write a note about this event" +msgstr "" + +msgid "This event doesn't have any notes" +msgstr "" + msgid "Schedule date info" msgstr "" @@ -1376,10 +1378,13 @@ msgstr "Info jadwal" msgid "Schedule date / Due date" msgstr "" -msgid "Event comments" +msgid "Event notes" +msgstr "" + +msgid "Write a note about this scheduled event" msgstr "" -msgid "Write a comment about this scheduled event" +msgid "Save note" msgstr "" msgid "" @@ -1445,6 +1450,12 @@ msgstr "" msgid "Choose a {{linkableStageLabel}}" msgstr "" +msgid "{{ linkableStageLabel }} is not repeatable" +msgstr "" + +msgid "{{ linkableStageLabel }} has no linkable events" +msgstr "" + msgid "Ambiguous relationships, contact system administrator" msgstr "" diff --git a/i18n/lo.po b/i18n/lo.po index d119a097a0..bb642cb79d 100644 --- a/i18n/lo.po +++ b/i18n/lo.po @@ -1,18 +1,18 @@ # # Translators: # Philip Larsen Donnelly, 2022 -# Thuy Nguyen , 2023 # Saysamone Sibounma, 2023 # Somkhit Bouavong , 2024 -# Viktor Varland , 2024 # Namwan Chanthavisouk, 2024 +# Viktor Varland , 2024 +# Thuy Nguyen , 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-04-12T20:48:54.429Z\n" +"POT-Creation-Date: 2024-06-28T11:23:02.970Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" -"Last-Translator: Namwan Chanthavisouk, 2024\n" +"Last-Translator: Thuy Nguyen , 2024\n" "Language-Team: Lao (https://app.transifex.com/hisp-uio/teams/100509/lo/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -194,15 +194,15 @@ msgstr "ຜູ້ໃຊ້ທີ່ຖືກມອບຫມາຍ" msgid "Search for user" msgstr "ຄົ້ນຫາຜູ້ໃຊ້" +msgid "Notes" +msgstr "ຂໍ້ຄວາມ" + msgid "Basic info" msgstr "ຂໍ້ມູນທົ່ວໄປ" msgid "Status" msgstr "ສະຖານະ" -msgid "Comments" -msgstr "ຄຳເຫັນ" - msgid "Relationships" msgstr "ສາຍພົວພັນ" @@ -233,8 +233,8 @@ msgstr "ທີ່ຍັງນໍາໃຊ້ຢູ່" msgid "Completed" msgstr "ສໍາເລັດແລ້ວ" -msgid "Please add or cancel comment before saving the event" -msgstr "ກະລຸນາເພີ່ມ ຫຼື ຍົກເລີກຄຳເຫັນກ່ອນບັນທຶກເຫດການ" +msgid "Please add or cancel note before saving the event" +msgstr "" msgid "Save and add another" msgstr "ບັນທຶກ ແລະ ເພີ່ມອີກ" @@ -620,14 +620,14 @@ msgstr "ບໍ່ມີການເຊື່ອມຕໍ່" msgid "Syncing" msgstr "ກຳລັງອັບເດດຂໍ້ມູນໃຫ້ຄືກັນ" -msgid "Add comment" -msgstr "ເພີ່ມຄວາມເຫັນ" +msgid "Add note" +msgstr "ຂຽນບັນທຶກລົງ" -msgid "You don't have access to write comments" -msgstr "ທ່ານບໍ່ໄດ້ຮັບອະນຸຍາດໃນການຂຽນຄວາມເຫັນ" +msgid "You don't have access to write notes" +msgstr "" -msgid "Write comment" -msgstr "ຂຽນຄວາມເຫັນ" +msgid "Write note" +msgstr "" msgid "was blanked out and hidden by your last action" msgstr "" @@ -827,8 +827,10 @@ msgstr "ຫຼືເບິ່ງເຫດການທັງໝົດທີ່ເ msgid "Please select an organisation unit." msgstr "ກະລຸນາເລືອກຫົວໜ່ວຍການຈັດຕັ້ງ" -msgid "New" -msgstr "ສ້າງໃຫມ່" +msgid "" +"You don't have access to create a {{trackedEntityName}} in the current " +"selections" +msgstr "" msgid "Choose the {{missingCategories}} to start reporting" msgstr "ເລືອກ {{missingCategories}} ເພື່ອເລີ່ມການລາຍງານ" @@ -836,8 +838,8 @@ msgstr "ເລືອກ {{missingCategories}} ເພື່ອເລີ່ມກ msgid "Save as new" msgstr "ບັນທຶກເປັນອັນໃໝ່" -msgid "View enrollment" -msgstr "ເບິ່ງການລົງທະບຽນ" +msgid "New" +msgstr "ສ້າງໃຫມ່" msgid "Create for" msgstr "ສ້າງສໍາລັບ" @@ -1141,9 +1143,6 @@ msgid "" "program. All activity will be logged." msgstr "" -msgid "Save comment" -msgstr "ບັນທຶກຄວາມເຫັນ" - msgid "Enrollment actions" msgstr "ການປະຕິບັດການລົງທະບຽນ" @@ -1265,14 +1264,8 @@ msgstr "ເພີ່ມຈຸດປະສານງານ" msgid "Add area" msgstr "ເພີ່ມພື້ນທີ່" -msgid "Comments about this enrollment" -msgstr "ຄໍາເຫັນກ່ຽວກັບການລົງທະບຽນນີ້" - -msgid "Write a comment about this enrollment" -msgstr "ຂຽນຄໍາເຫັນກ່ຽວກັບການລົງທະບຽນນີ້" - -msgid "This enrollment doesn't have any comments" -msgstr "ການລົງທະບຽນນີ້ບໍ່ມີຄຳເຫັນໃດໆ" +msgid "Please add or cancel the note before saving the event" +msgstr "" msgid "organisation unit could not be retrieved. Please try again later." msgstr "ບໍ່ສາມາດດຶງຂໍ້ມູນຫົວໜ່ວຍອົງການຈັດຕັ້ງໄດ້. ກະລຸນາລອງໃໝ່ພາຍຫຼັງ." @@ -1283,21 +1276,21 @@ msgstr "ກຳລັງບັນທຶກໃສ່ {{stageName}} ສຳລັບ msgid "program or stage is invalid" msgstr "ໂປແກຼມ ຫຼື ຂັ້ນຕອນບໍ່ຖືກຕ້ອງ" +msgid "Notes about this enrollment" +msgstr "" + +msgid "Write a note about this enrollment" +msgstr "" + +msgid "This enrollment doesn't have any notes" +msgstr "" + msgid "Error" msgstr "ເກີດການຜິດພາດ" msgid "Warning" msgstr "ແຈ້ງເຕືອນ" -msgid "Comments about this event" -msgstr "ຄໍາເຫັນຂອງເຫດການນີ້" - -msgid "Write a comment about this event" -msgstr "ຂຽນຄຳເຫັນຂອງເຫດການນີ້" - -msgid "This event doesn't have any comments" -msgstr "ເຫດການນີ້ບໍ່ມີຄຳເຫັນ" - msgid "stage not found in rules execution" msgstr "" @@ -1319,6 +1312,15 @@ msgstr "ກິດຈະກຳສຳເລັດແລ້ວ" msgid "Back to all stages and events" msgstr "ກັບໄປທຸກຂັ້ນຕອນ ແລະ ເຫດການ" +msgid "Notes about this event" +msgstr "" + +msgid "Write a note about this event" +msgstr "" + +msgid "This event doesn't have any notes" +msgstr "" + msgid "Schedule date info" msgstr "ຂໍ້ມູນຕາຕະລາງວັນທີ" @@ -1356,11 +1358,14 @@ msgstr "ຂໍ້ມູນຕາຕະລາງ" msgid "Schedule date / Due date" msgstr "ວັນທີຕາຕະລາງ / ວັນຄົບກໍານົດ" -msgid "Event comments" -msgstr "ຄໍາເຫັນກ່ຽວກັບເຫດການ" +msgid "Event notes" +msgstr "" + +msgid "Write a note about this scheduled event" +msgstr "" -msgid "Write a comment about this scheduled event" -msgstr "ຂຽນຄໍາເຫັນກ່ຽວກັບເຫດການທີ່ກໍານົດໄວ້ນີ້" +msgid "Save note" +msgstr "ບັນທຶກ" msgid "" "Change information about this {{trackedEntityName}} here. To change " @@ -1425,6 +1430,12 @@ msgstr "ເຊື່ອມຫາ {{linkableStageLabel}} ທີ່ມີຢູ່ msgid "Choose a {{linkableStageLabel}}" msgstr "ເລືອກ {{linkableStageLabel}}" +msgid "{{ linkableStageLabel }} is not repeatable" +msgstr "" + +msgid "{{ linkableStageLabel }} has no linkable events" +msgstr "" + msgid "Ambiguous relationships, contact system administrator" msgstr "" diff --git a/i18n/my.po b/i18n/my.po index 964c02c3de..2485fda6e3 100644 --- a/i18n/my.po +++ b/i18n/my.po @@ -1,16 +1,16 @@ # # Translators: -# Aung Kyi Min , 2019 # Viktor Varland , 2021 # Wanda , 2021 # Philip Larsen Donnelly, 2024 +# Aung Kyi Min , 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-02-14T10:01:26.732Z\n" +"POT-Creation-Date: 2024-06-28T11:23:02.970Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" -"Last-Translator: Philip Larsen Donnelly, 2024\n" +"Last-Translator: Aung Kyi Min , 2024\n" "Language-Team: Burmese (https://app.transifex.com/hisp-uio/teams/100509/my/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -192,15 +192,15 @@ msgstr "" msgid "Search for user" msgstr "" +msgid "Notes" +msgstr "မှတ်စု" + msgid "Basic info" msgstr "" msgid "Status" msgstr "အခြေအနေ" -msgid "Comments" -msgstr "" - msgid "Relationships" msgstr "" @@ -229,7 +229,7 @@ msgstr "လုပ်ဆောင်နိုင်သည်" msgid "Completed" msgstr "" -msgid "Please add or cancel comment before saving the event" +msgid "Please add or cancel note before saving the event" msgstr "" msgid "Save and add another" @@ -312,6 +312,29 @@ msgstr "" msgid "An error has occurred. See log for details" msgstr "" +msgid "{{programStageName}} completed" +msgstr "" + +msgid "" +"Would you like to complete the enrollment and all active events as well?" +msgstr "" + +msgid "{{count}} event in {{programStageName}}" +msgid_plural "{{count}} event in {{programStageName}}" +msgstr[0] "" + +msgid "Yes, complete enrollment and events" +msgstr "" + +msgid "Complete enrollment only" +msgstr "" + +msgid "Would you like to complete the enrollment?" +msgstr "" + +msgid "Complete enrollment" +msgstr "" + msgid "A duplicate exists (but there were some errors, see log for details" msgstr "" @@ -576,7 +599,7 @@ msgstr "" msgid "Program doesn't exist" msgstr "" -msgid "Selected program is invalid for selected registering unit" +msgid "Selected program is invalid for selected organisation unit" msgstr "" msgid "Online" @@ -588,13 +611,13 @@ msgstr "အင်တာနက်နှင့်မချိတ်ဆက်ထာ msgid "Syncing" msgstr "" -msgid "Add comment" +msgid "Add note" msgstr "" -msgid "You don't have access to write comments" +msgid "You don't have access to write notes" msgstr "" -msgid "Write comment" +msgid "Write note" msgstr "" msgid "was blanked out and hidden by your last action" @@ -655,6 +678,12 @@ msgid "" "An error occurred while fetching enrollments. Please enter a valid url." msgstr "" +msgid "No feedback for this enrollment yet" +msgstr "" + +msgid "No indicator output for this enrollment yet" +msgstr "" + msgid "Quick actions" msgstr "" @@ -735,7 +764,13 @@ msgstr "" msgid "There was an error loading the page" msgstr "" -msgid "Choose a registering unit to start reporting" +msgid "Choose an organisation unit to start reporting" +msgstr "" + +msgid "No feedback for this event yet" +msgstr "" + +msgid "No indicator output for this event yet" msgstr "" msgid "Program stage is invalid" @@ -780,8 +815,10 @@ msgstr "" msgid "Please select an organisation unit." msgstr "" -msgid "New" -msgstr "အသစ်" +msgid "" +"You don't have access to create a {{trackedEntityName}} in the current " +"selections" +msgstr "" msgid "Choose the {{missingCategories}} to start reporting" msgstr "" @@ -789,8 +826,8 @@ msgstr "" msgid "Save as new" msgstr "" -msgid "View enrollment" -msgstr "" +msgid "New" +msgstr "အသစ်" msgid "Create for" msgstr "" @@ -868,6 +905,9 @@ msgstr "" msgid "Edit event" msgstr "" +msgid "View changelog" +msgstr "" + msgid "Event details" msgstr "" @@ -897,12 +937,6 @@ msgstr "" msgid "View Event" msgstr "" -msgid "No feedback for this enrollment yet" -msgstr "" - -msgid "No indicator output for this enrollment yet" -msgstr "" - msgid "Selected program" msgstr "" @@ -912,6 +946,10 @@ msgstr "" msgid "Search by attributes" msgstr "" +msgid "Fill in at least {{count}} attribute to search" +msgid_plural "Fill in at least {{count}} attribute to search" +msgstr[0] "" + msgid "Could not retrieve metadata. Please try again later." msgstr "" @@ -936,10 +974,7 @@ msgstr "" msgid "No results found for " msgstr "" -msgid "Registering unit" -msgstr "" - -msgid "Choose a registering unit" +msgid "Choose an organisation unit" msgstr "" msgid "Clear selection" @@ -951,7 +986,7 @@ msgstr "" msgid "Search for a program" msgstr "" -msgid "Some programs are being filtered by the chosen registering unit" +msgid "Some programs are being filtered by the chosen organisation unit" msgstr "" msgid "Show all programs" @@ -1044,12 +1079,18 @@ msgstr "" msgid "Create saved list" msgstr "" -msgid "New {{trackedEntityName}} in {{programName}}" +msgid "Create new in another program" +msgstr "" + +msgid "Create new event" msgstr "" msgid "Search for a {{trackedEntityName}} in {{programName}}" msgstr "" +msgid "No tracked entity types available" +msgstr "" + msgid "Assigned to" msgstr "" @@ -1087,9 +1128,6 @@ msgid "" "program. All activity will be logged." msgstr "" -msgid "Save comment" -msgstr "မှတ်ချက်ကိုသိမ်းပါ။" - msgid "Enrollment actions" msgstr "" @@ -1128,6 +1166,12 @@ msgstr "" msgid "Mark for follow-up" msgstr "" +msgid "Transfer" +msgstr "" + +msgid "An error occurred while transferring ownership" +msgstr "" + msgid "Existing dates for auto-generated events will not be updated." msgstr "" @@ -1155,6 +1199,24 @@ msgstr "" msgid "Set area" msgstr "" +msgid "" +"Transferring enrollment ownership from {{ownerOrgUnit}} to " +"{{newOrgUnit}}{{escape}}" +msgstr "" + +msgid "" +"You will lose access to the enrollment when transferring ownership to " +"{{organisationUnit}}." +msgstr "" + +msgid "Transfer Ownership" +msgstr "" + +msgid "" +"Choose the organisation unit to which enrollment ownership should be " +"transferred." +msgstr "" + msgid "Enrollment date" msgstr "Дата зачисления" @@ -1185,22 +1247,25 @@ msgstr "" msgid "Add area" msgstr "" -msgid "Comments about this enrollment" +msgid "Please add or cancel the note before saving the event" msgstr "" -msgid "Write a comment about this enrollment" +msgid "organisation unit could not be retrieved. Please try again later." msgstr "" -msgid "This enrollment doesn't have any comments" +msgid "Saving to {{stageName}} for {{programName}} in {{orgUnitName}}" msgstr "" -msgid "organisation unit could not be retrieved. Please try again later." +msgid "program or stage is invalid" msgstr "" -msgid "Saving to {{stageName}} for {{programName}} in {{orgUnitName}}" +msgid "Notes about this enrollment" msgstr "" -msgid "program or stage is invalid" +msgid "Write a note about this enrollment" +msgstr "" + +msgid "This enrollment doesn't have any notes" msgstr "" msgid "Error" @@ -1209,15 +1274,6 @@ msgstr "အမှား" msgid "Warning" msgstr "သတိ" -msgid "Comments about this event" -msgstr "" - -msgid "Write a comment about this event" -msgstr "" - -msgid "This event doesn't have any comments" -msgstr "" - msgid "stage not found in rules execution" msgstr "" @@ -1239,6 +1295,15 @@ msgstr "" msgid "Back to all stages and events" msgstr "" +msgid "Notes about this event" +msgstr "" + +msgid "Write a note about this event" +msgstr "" + +msgid "This event doesn't have any notes" +msgstr "" + msgid "Schedule date info" msgstr "" @@ -1249,12 +1314,22 @@ msgid "" "The scheduled date matches the suggested date, but can be changed if needed." msgstr "" +msgid "The scheduled date is {{count}} days {{position}} the suggested date." +msgid_plural "" +"The scheduled date is {{count}} days {{position}} the suggested date." +msgstr[0] "" + msgid "after" msgstr "" msgid "before" msgstr "" +msgid "There are {{count}} scheduled event in {{orgUnitName}} on this day." +msgid_plural "" +"There are {{count}} scheduled event in {{orgUnitName}} on this day." +msgstr[0] "" + msgid "" "Scheduling an event in {{stageName}} for {{programName}} in {{orgUnitName}}" msgstr "" @@ -1265,10 +1340,13 @@ msgstr "" msgid "Schedule date / Due date" msgstr "" -msgid "Event comments" +msgid "Event notes" msgstr "" -msgid "Write a comment about this scheduled event" +msgid "Write a note about this scheduled event" +msgstr "" + +msgid "Save note" msgstr "" msgid "" @@ -1301,15 +1379,68 @@ msgstr "" msgid "Fix errors in the form to continue." msgstr "" +msgid "You do not have access to delete this {{trackedEntityTypeName}}" +msgstr "" + +msgid "Delete {{trackedEntityTypeName}}" +msgstr "" + +msgid "" +"Are you sure you want to delete this {{trackedEntityTypeName}}? This will " +"permanently remove the {{trackedEntityTypeName}} and all its associated " +"enrollments and events in all programs." +msgstr "" + +msgid "There was a problem deleting the {{trackedEntityTypeName}}" +msgstr "" + +msgid "Yes, delete {{trackedEntityTypeName}}" +msgstr "" + msgid "Profile widget could not be loaded. Please try again later" msgstr "" -msgid "{{TETName}} profile" +msgid "{{trackedEntityTypeName}} profile" msgstr "" msgid "tracked entity instance" msgstr "" +msgid "Link to an existing {{linkableStageLabel}}" +msgstr "" + +msgid "Choose a {{linkableStageLabel}}" +msgstr "" + +msgid "{{ linkableStageLabel }} is not repeatable" +msgstr "" + +msgid "{{ linkableStageLabel }} has no linkable events" +msgstr "" + +msgid "Ambiguous relationships, contact system administrator" +msgstr "" + +msgid "" +"Enter {{linkableStageLabel}} details in the next step after completing this " +"{{currentStageLabel}}." +msgstr "" + +msgid "Enter details now" +msgstr "" + +msgid "Link to an existing" +msgstr "" + +msgid "Scheduled date" +msgstr "" + +msgid "Report date" +msgstr "" + +msgid "Please select a valid event" +msgstr "" + msgid "New {{ eventName }} event" msgstr "" @@ -1331,8 +1462,9 @@ msgstr "" msgid "Events could not be retrieved. Please try again later." msgstr "" -msgid "{{ totalEvents }} events" -msgstr "" +msgid "{{ count }} event" +msgid_plural "{{ count }} event" +msgstr[0] "" msgid "{{ overdueEvents }} overdue" msgstr "" @@ -1343,6 +1475,30 @@ msgstr "" msgid "Stages and Events" msgstr "" +msgid "Changelog" +msgstr "" + +msgid "No changes to display" +msgstr "" + +msgid "Created" +msgstr "" + +msgid "Deleted" +msgstr "" + +msgid "Date" +msgstr "ရက်စွဲ" + +msgid "User" +msgstr "" + +msgid "Data item" +msgstr "" + +msgid "Change" +msgstr "" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" @@ -1368,28 +1524,33 @@ msgstr "" msgid "{{trackedEntityTypeName}} relationships" msgstr "" -msgid "To open this relationship, please wait until saving is complete" +msgid "Delete relationship" msgstr "" -msgid "Type" -msgstr "ပုံစံ" +msgid "" +"Deleting the relationship is permanent and cannot be undone. Are you sure " +"you want to delete this relationship?" +msgstr "" -msgid "Created date" +msgid "Yes, delete relationship" msgstr "" -msgid "Program stage name" +msgid "An error occurred while deleting the relationship." msgstr "" -msgid "Working list could not be loaded" +msgid "To open this relationship, please wait until saving is complete" msgstr "" -msgid "Download as JSON" +msgid "Type" +msgstr "ပုံစံ" + +msgid "Created date" msgstr "" -msgid "Download as CSV" +msgid "Program stage name" msgstr "" -msgid "Download with current filters" +msgid "Working list could not be loaded" msgstr "" msgid "Download data..." @@ -1407,6 +1568,9 @@ msgstr "" msgid "Enrollment status" msgstr "" +msgid "Follow up" +msgstr "" + msgid "Choose a program stage to filter by {{label}}" msgstr "" @@ -1461,6 +1625,15 @@ msgstr "" msgid "Show All" msgstr "" +msgid "Download as JSON" +msgstr "" + +msgid "Download as CSV" +msgstr "" + +msgid "Download with current filters" +msgstr "" + msgid "An error has occured. See log for details" msgstr "" @@ -1533,9 +1706,6 @@ msgstr "" msgid "Set coordinate" msgstr "" -msgid "Date" -msgstr "ရက်စွဲ" - msgid "Time" msgstr "" diff --git a/i18n/nb.po b/i18n/nb.po index 9d80c2f9e1..383ff2a62e 100644 --- a/i18n/nb.po +++ b/i18n/nb.po @@ -1,14 +1,14 @@ # # Translators: -# Caroline Hesthagen Holen , 2024 # Karoline Tufte Lien , 2024 +# Caroline Hesthagen Holen , 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-04-12T20:48:54.429Z\n" +"POT-Creation-Date: 2024-06-28T11:23:02.970Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" -"Last-Translator: Karoline Tufte Lien , 2024\n" +"Last-Translator: Caroline Hesthagen Holen , 2024\n" "Language-Team: Norwegian Bokmål (https://app.transifex.com/hisp-uio/teams/100509/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -196,15 +196,15 @@ msgstr "Tildelt programbruker" msgid "Search for user" msgstr "Søk etter bruker" +msgid "Notes" +msgstr "Notater" + msgid "Basic info" msgstr "Grunnleggende informasjon" msgid "Status" msgstr "Status" -msgid "Comments" -msgstr "Kommentarer" - msgid "Relationships" msgstr "Relasjoner" @@ -236,8 +236,8 @@ msgstr "Aktiv" msgid "Completed" msgstr "Fullført" -msgid "Please add or cancel comment before saving the event" -msgstr "Legg til eller avbryt kommentar før du lagrer hendelsen" +msgid "Please add or cancel note before saving the event" +msgstr "" msgid "Save and add another" msgstr "Lagre og legg til en til" @@ -628,14 +628,14 @@ msgstr "Frakoblet" msgid "Syncing" msgstr "Synkroniserer" -msgid "Add comment" -msgstr "Legg til en kommentar" +msgid "Add note" +msgstr "Legg til notat" -msgid "You don't have access to write comments" -msgstr "Du har ikke tilgang til å skrive kommentarer" +msgid "You don't have access to write notes" +msgstr "" -msgid "Write comment" -msgstr "Skriv kommentar" +msgid "Write note" +msgstr "" msgid "was blanked out and hidden by your last action" msgstr "ble tømt og skjult av den siste handlingen din" @@ -852,8 +852,10 @@ msgstr "Eller se alle hendelser som er tilgjengelige for deg i {{program}}" msgid "Please select an organisation unit." msgstr "Vennligst velg en organisasjonsenhet" -msgid "New" -msgstr "Ny" +msgid "" +"You don't have access to create a {{trackedEntityName}} in the current " +"selections" +msgstr "" msgid "Choose the {{missingCategories}} to start reporting" msgstr "Velg {{missingCategories}} for å starte rapportering" @@ -861,8 +863,8 @@ msgstr "Velg {{missingCategories}} for å starte rapportering" msgid "Save as new" msgstr "Lagre som ny" -msgid "View enrollment" -msgstr "Se registrering" +msgid "New" +msgstr "Ny" msgid "Create for" msgstr "Opprett for" @@ -1178,9 +1180,6 @@ msgstr "" "Du må oppgi en grunn for å se etter registreringer i dette beskyttede " "programmet. All aktivitet vil bli logget." -msgid "Save comment" -msgstr "Lagre kommentar" - msgid "Enrollment actions" msgstr "Registreringshandlinger" @@ -1304,14 +1303,8 @@ msgstr "Legg til koordinater" msgid "Add area" msgstr "Legg til område" -msgid "Comments about this enrollment" -msgstr "Kommentarer om denne registreringen" - -msgid "Write a comment about this enrollment" -msgstr "Skriv en kommentar om denne registreringen" - -msgid "This enrollment doesn't have any comments" -msgstr "Denne registreringen har ingen kommentarer" +msgid "Please add or cancel the note before saving the event" +msgstr "" msgid "organisation unit could not be retrieved. Please try again later." msgstr "organisasjonsenheten kunne ikke hentes. Prøv igjen senere." @@ -1322,21 +1315,21 @@ msgstr "Lagrer i {{stageName}} for {{programName}} i {{orgUnitName}}" msgid "program or stage is invalid" msgstr "program eller fase er ugyldig" +msgid "Notes about this enrollment" +msgstr "" + +msgid "Write a note about this enrollment" +msgstr "" + +msgid "This enrollment doesn't have any notes" +msgstr "" + msgid "Error" msgstr "Feil" msgid "Warning" msgstr "Advarsel" -msgid "Comments about this event" -msgstr "Kommentarer om denne hendelsen" - -msgid "Write a comment about this event" -msgstr "Skriv en kommentar om denne hendelsen" - -msgid "This event doesn't have any comments" -msgstr "Denne hendelsen har ingen kommentarer" - msgid "stage not found in rules execution" msgstr "fase ikke funnet i regelutførelse" @@ -1358,6 +1351,15 @@ msgstr "Hendelse fullført" msgid "Back to all stages and events" msgstr "Tilbake til alle faser og hendelser" +msgid "Notes about this event" +msgstr "" + +msgid "Write a note about this event" +msgstr "" + +msgid "This event doesn't have any notes" +msgstr "" + msgid "Schedule date info" msgstr "Informasjon for planlagt dato" @@ -1402,11 +1404,14 @@ msgstr "Tidsplaninformasjon" msgid "Schedule date / Due date" msgstr "Planlagt dato / Forfallsdato" -msgid "Event comments" -msgstr "Hendelseskommentarer" +msgid "Event notes" +msgstr "" + +msgid "Write a note about this scheduled event" +msgstr "" -msgid "Write a comment about this scheduled event" -msgstr "Skriv en kommentar om denne planlagte hendelsen" +msgid "Save note" +msgstr "Lagre notat" msgid "" "Change information about this {{trackedEntityName}} here. To change " @@ -1474,6 +1479,12 @@ msgstr "" msgid "Choose a {{linkableStageLabel}}" msgstr "" +msgid "{{ linkableStageLabel }} is not repeatable" +msgstr "" + +msgid "{{ linkableStageLabel }} has no linkable events" +msgstr "" + msgid "Ambiguous relationships, contact system administrator" msgstr "" diff --git a/i18n/nl.po b/i18n/nl.po index d493d48110..b4a094bd97 100644 --- a/i18n/nl.po +++ b/i18n/nl.po @@ -3,13 +3,13 @@ # Cherise Beek , 2021 # Yury Rogachev , 2021 # Philip Larsen Donnelly, 2024 -# Rica Zamora Duchateau, 2024 +# Rica, 2024 # Charel van den Elsen, 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-04-12T20:48:54.429Z\n" +"POT-Creation-Date: 2024-06-28T11:23:02.970Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Charel van den Elsen, 2024\n" "Language-Team: Dutch (https://app.transifex.com/hisp-uio/teams/100509/nl/)\n" @@ -202,15 +202,15 @@ msgstr "Toegewezen gebruiker" msgid "Search for user" msgstr "Zoek naar gebruiker" +msgid "Notes" +msgstr "Notities" + msgid "Basic info" msgstr "Basis informatie" msgid "Status" msgstr "status" -msgid "Comments" -msgstr "Opmerkingen" - msgid "Relationships" msgstr "Relaties" @@ -242,9 +242,8 @@ msgstr "Actief" msgid "Completed" msgstr "Voltooid" -msgid "Please add or cancel comment before saving the event" +msgid "Please add or cancel note before saving the event" msgstr "" -"Voeg een opmerking toe of annuleer deze voordat u het evenement opslaat" msgid "Save and add another" msgstr "Sla op en voeg er nog een toe" @@ -636,14 +635,14 @@ msgstr "offline" msgid "Syncing" msgstr "synchroniseren" -msgid "Add comment" -msgstr "Voeg opmerking toe" +msgid "Add note" +msgstr "Notitie toevoegen" -msgid "You don't have access to write comments" -msgstr "U heeft geen toegang om opmerkingen te schrijven" +msgid "You don't have access to write notes" +msgstr "" -msgid "Write comment" -msgstr "Schrijf commentaar" +msgid "Write note" +msgstr "" msgid "was blanked out and hidden by your last action" msgstr "" @@ -867,8 +866,10 @@ msgstr "" msgid "Please select an organisation unit." msgstr "Selecteer een organisatie-eenheid." -msgid "New" -msgstr "Nieuw" +msgid "" +"You don't have access to create a {{trackedEntityName}} in the current " +"selections" +msgstr "" msgid "Choose the {{missingCategories}} to start reporting" msgstr "Kies de {{missingCategories}} om te beginnen met rapporteren" @@ -876,8 +877,8 @@ msgstr "Kies de {{missingCategories}} om te beginnen met rapporteren" msgid "Save as new" msgstr "Opslaan als nieuw" -msgid "View enrollment" -msgstr "Inschrijving bekijken" +msgid "New" +msgstr "Nieuw" msgid "Create for" msgstr "Creëer voor" @@ -1199,9 +1200,6 @@ msgstr "" "U moet een reden opgeven om te controleren op inschrijvingen voor dit " "beschermde programma. Alle activiteiten worden geregistreerd." -msgid "Save comment" -msgstr "Opmerking opslaan" - msgid "Enrollment actions" msgstr "Inschrijving acties" @@ -1325,14 +1323,8 @@ msgstr "" msgid "Add area" msgstr "" -msgid "Comments about this enrollment" -msgstr "Opmerkingen over deze inschrijving" - -msgid "Write a comment about this enrollment" -msgstr "Schrijf een opmerking over deze inschrijving" - -msgid "This enrollment doesn't have any comments" -msgstr "Deze inschrijving heeft geen opmerkingen" +msgid "Please add or cancel the note before saving the event" +msgstr "" msgid "organisation unit could not be retrieved. Please try again later." msgstr "" @@ -1344,21 +1336,21 @@ msgstr "Opslaan in {{stageName}} voor {{programName}} in {{orgUnitName}}" msgid "program or stage is invalid" msgstr "programma of fase is ongeldig" +msgid "Notes about this enrollment" +msgstr "" + +msgid "Write a note about this enrollment" +msgstr "" + +msgid "This enrollment doesn't have any notes" +msgstr "" + msgid "Error" msgstr "Fout" msgid "Warning" msgstr "Waarschuwing" -msgid "Comments about this event" -msgstr "Opmerkingen over dit evenement" - -msgid "Write a comment about this event" -msgstr "Schrijf een reactie over dit evenement" - -msgid "This event doesn't have any comments" -msgstr "Dit evenement heeft geen opmerkingen" - msgid "stage not found in rules execution" msgstr "stadium niet gevonden in uitvoering van regels" @@ -1381,6 +1373,15 @@ msgstr "Evenement voltooid" msgid "Back to all stages and events" msgstr "Terug naar alle stadium en evenementen" +msgid "Notes about this event" +msgstr "" + +msgid "Write a note about this event" +msgstr "" + +msgid "This event doesn't have any notes" +msgstr "" + msgid "Schedule date info" msgstr "Plan datum info" @@ -1427,11 +1428,14 @@ msgstr "Schema info" msgid "Schedule date / Due date" msgstr "Schemadatum / Vervaldatum" -msgid "Event comments" -msgstr "Evenement opmerkingen" +msgid "Event notes" +msgstr "" + +msgid "Write a note about this scheduled event" +msgstr "" -msgid "Write a comment about this scheduled event" -msgstr "Schrijf een opmerking over dit geplande evenement" +msgid "Save note" +msgstr "Notitie opslaan" msgid "" "Change information about this {{trackedEntityName}} here. To change " @@ -1501,6 +1505,12 @@ msgstr "" msgid "Choose a {{linkableStageLabel}}" msgstr "" +msgid "{{ linkableStageLabel }} is not repeatable" +msgstr "" + +msgid "{{ linkableStageLabel }} has no linkable events" +msgstr "" + msgid "Ambiguous relationships, contact system administrator" msgstr "" diff --git a/i18n/pt.po b/i18n/pt.po index f59e9af24d..ca76818203 100644 --- a/i18n/pt.po +++ b/i18n/pt.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-04-12T20:48:54.429Z\n" +"POT-Creation-Date: 2024-06-28T11:23:02.970Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Viktor Varland , 2024\n" "Language-Team: Portuguese (https://app.transifex.com/hisp-uio/teams/100509/pt/)\n" @@ -202,15 +202,15 @@ msgstr "Utilizador atribuído" msgid "Search for user" msgstr "Pesquisar por utilizador" +msgid "Notes" +msgstr "Notas" + msgid "Basic info" msgstr "Informação básica" msgid "Status" msgstr "Status" -msgid "Comments" -msgstr "Comentários" - msgid "Relationships" msgstr "Relacionamentos" @@ -242,8 +242,8 @@ msgstr "Ativo" msgid "Completed" msgstr "Concluído" -msgid "Please add or cancel comment before saving the event" -msgstr "Adicione ou cancele o comentário antes de salvar o evento" +msgid "Please add or cancel note before saving the event" +msgstr "" msgid "Save and add another" msgstr "Gravar e adicionar outro" @@ -637,14 +637,14 @@ msgstr "Desligado" msgid "Syncing" msgstr "Sincronizando" -msgid "Add comment" -msgstr "Adicionar comentário" +msgid "Add note" +msgstr "Adicionar uma nota" -msgid "You don't have access to write comments" -msgstr "Não tem acesso para escrever comentários" +msgid "You don't have access to write notes" +msgstr "" -msgid "Write comment" -msgstr "Escreva um comentário" +msgid "Write note" +msgstr "" msgid "was blanked out and hidden by your last action" msgstr "foi apagado e escondido pela sua última ação" @@ -861,8 +861,10 @@ msgstr "Ou veja todos os eventos acessíveis a você no {{program}}" msgid "Please select an organisation unit." msgstr "Selecione uma unidade organizacional." -msgid "New" -msgstr "Novo" +msgid "" +"You don't have access to create a {{trackedEntityName}} in the current " +"selections" +msgstr "" msgid "Choose the {{missingCategories}} to start reporting" msgstr "Escolha as {{missingCategories}} para começar a relatar" @@ -870,8 +872,8 @@ msgstr "Escolha as {{missingCategories}} para começar a relatar" msgid "Save as new" msgstr "Gravar como novo" -msgid "View enrollment" -msgstr "Ver inscrição" +msgid "New" +msgstr "Novo" msgid "Create for" msgstr "Criar para" @@ -1194,9 +1196,6 @@ msgstr "" "Deve fornecer um motivo para verificar as inscrições neste programa " "protegido. Todas as atividades serão registradas." -msgid "Save comment" -msgstr "Gravar comentário" - msgid "Enrollment actions" msgstr "Ações de inscrição" @@ -1320,14 +1319,8 @@ msgstr "" msgid "Add area" msgstr "" -msgid "Comments about this enrollment" -msgstr "Comentários sobre esta inscrição" - -msgid "Write a comment about this enrollment" -msgstr "Escreva um comentário sobre esta inscrição" - -msgid "This enrollment doesn't have any comments" -msgstr "Esta inscrição não possui comentários" +msgid "Please add or cancel the note before saving the event" +msgstr "" msgid "organisation unit could not be retrieved. Please try again later." msgstr "" @@ -1340,21 +1333,21 @@ msgstr "Gravar em {{stageName}} para {{programName}} em {{orgUnitName}}" msgid "program or stage is invalid" msgstr "programa ou estágio é inválido" +msgid "Notes about this enrollment" +msgstr "" + +msgid "Write a note about this enrollment" +msgstr "" + +msgid "This enrollment doesn't have any notes" +msgstr "" + msgid "Error" msgstr "Erro" msgid "Warning" msgstr "Aviso" -msgid "Comments about this event" -msgstr "Comentários sobre este evento" - -msgid "Write a comment about this event" -msgstr "Escreva um comentário sobre este evento" - -msgid "This event doesn't have any comments" -msgstr "Este evento não possui comentários" - msgid "stage not found in rules execution" msgstr "estágio não encontrado na execução das regras" @@ -1376,6 +1369,15 @@ msgstr "Evento concluído" msgid "Back to all stages and events" msgstr "Voltar para todos os palcos e eventos" +msgid "Notes about this event" +msgstr "" + +msgid "Write a note about this event" +msgstr "" + +msgid "This event doesn't have any notes" +msgstr "" + msgid "Schedule date info" msgstr "Informação da data da programação" @@ -1419,11 +1421,14 @@ msgstr "Informação de programação" msgid "Schedule date / Due date" msgstr "Data de programação / Data de vencimento" -msgid "Event comments" -msgstr "Comentários do evento" +msgid "Event notes" +msgstr "" + +msgid "Write a note about this scheduled event" +msgstr "" -msgid "Write a comment about this scheduled event" -msgstr "Escreva um comentário sobre este evento agendado" +msgid "Save note" +msgstr "Gravar notas" msgid "" "Change information about this {{trackedEntityName}} here. To change " @@ -1495,6 +1500,12 @@ msgstr "" msgid "Choose a {{linkableStageLabel}}" msgstr "" +msgid "{{ linkableStageLabel }} is not repeatable" +msgstr "" + +msgid "{{ linkableStageLabel }} has no linkable events" +msgstr "" + msgid "Ambiguous relationships, contact system administrator" msgstr "" diff --git a/i18n/pt_BR.po b/i18n/pt_BR.po index 48abb47ca8..e9e5f01f49 100644 --- a/i18n/pt_BR.po +++ b/i18n/pt_BR.po @@ -2,15 +2,15 @@ # Translators: # Oscar Mesones Lapouble , 2021 # Philip Larsen Donnelly, 2024 -# Thiago Rocha, 2024 # Viktor Varland , 2024 +# Thiago Rocha, 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-04-12T20:48:54.429Z\n" +"POT-Creation-Date: 2024-06-28T11:23:02.970Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" -"Last-Translator: Viktor Varland , 2024\n" +"Last-Translator: Thiago Rocha, 2024\n" "Language-Team: Portuguese (Brazil) (https://app.transifex.com/hisp-uio/teams/100509/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -192,15 +192,15 @@ msgstr "Usuário atribuído" msgid "Search for user" msgstr "" +msgid "Notes" +msgstr "Notas" + msgid "Basic info" msgstr "" msgid "Status" msgstr "Estado" -msgid "Comments" -msgstr "" - msgid "Relationships" msgstr "Relacionamentos" @@ -229,7 +229,7 @@ msgstr "Activo" msgid "Completed" msgstr "Concluído" -msgid "Please add or cancel comment before saving the event" +msgid "Please add or cancel note before saving the event" msgstr "" msgid "Save and add another" @@ -613,13 +613,13 @@ msgstr "Desligado" msgid "Syncing" msgstr "" -msgid "Add comment" -msgstr "" +msgid "Add note" +msgstr "Adicionar uma nota" -msgid "You don't have access to write comments" +msgid "You don't have access to write notes" msgstr "" -msgid "Write comment" +msgid "Write note" msgstr "" msgid "was blanked out and hidden by your last action" @@ -817,8 +817,10 @@ msgstr "" msgid "Please select an organisation unit." msgstr "" -msgid "New" -msgstr "Novo" +msgid "" +"You don't have access to create a {{trackedEntityName}} in the current " +"selections" +msgstr "" msgid "Choose the {{missingCategories}} to start reporting" msgstr "" @@ -826,8 +828,8 @@ msgstr "" msgid "Save as new" msgstr "" -msgid "View enrollment" -msgstr "" +msgid "New" +msgstr "Novo" msgid "Create for" msgstr "" @@ -1130,9 +1132,6 @@ msgid "" "program. All activity will be logged." msgstr "" -msgid "Save comment" -msgstr "Grave comentário" - msgid "Enrollment actions" msgstr "" @@ -1252,22 +1251,25 @@ msgstr "" msgid "Add area" msgstr "" -msgid "Comments about this enrollment" +msgid "Please add or cancel the note before saving the event" msgstr "" -msgid "Write a comment about this enrollment" +msgid "organisation unit could not be retrieved. Please try again later." msgstr "" -msgid "This enrollment doesn't have any comments" +msgid "Saving to {{stageName}} for {{programName}} in {{orgUnitName}}" msgstr "" -msgid "organisation unit could not be retrieved. Please try again later." +msgid "program or stage is invalid" msgstr "" -msgid "Saving to {{stageName}} for {{programName}} in {{orgUnitName}}" +msgid "Notes about this enrollment" msgstr "" -msgid "program or stage is invalid" +msgid "Write a note about this enrollment" +msgstr "" + +msgid "This enrollment doesn't have any notes" msgstr "" msgid "Error" @@ -1276,15 +1278,6 @@ msgstr "Erro" msgid "Warning" msgstr "Advertência" -msgid "Comments about this event" -msgstr "" - -msgid "Write a comment about this event" -msgstr "" - -msgid "This event doesn't have any comments" -msgstr "" - msgid "stage not found in rules execution" msgstr "" @@ -1306,6 +1299,15 @@ msgstr "" msgid "Back to all stages and events" msgstr "" +msgid "Notes about this event" +msgstr "" + +msgid "Write a note about this event" +msgstr "" + +msgid "This event doesn't have any notes" +msgstr "" + msgid "Schedule date info" msgstr "" @@ -1346,12 +1348,15 @@ msgstr "" msgid "Schedule date / Due date" msgstr "" -msgid "Event comments" +msgid "Event notes" msgstr "" -msgid "Write a comment about this scheduled event" +msgid "Write a note about this scheduled event" msgstr "" +msgid "Save note" +msgstr "Gravar notas" + msgid "" "Change information about this {{trackedEntityName}} here. To change " "information about this enrollment, use the Edit button in the in the " @@ -1415,6 +1420,12 @@ msgstr "" msgid "Choose a {{linkableStageLabel}}" msgstr "" +msgid "{{ linkableStageLabel }} is not repeatable" +msgstr "" + +msgid "{{ linkableStageLabel }} has no linkable events" +msgstr "" + msgid "Ambiguous relationships, contact system administrator" msgstr "" diff --git a/i18n/ro.po b/i18n/ro.po index aed9e639c1..8f17babcaa 100644 --- a/i18n/ro.po +++ b/i18n/ro.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-04-12T20:48:54.429Z\n" +"POT-Creation-Date: 2024-06-28T11:23:02.970Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Valeriu Plesca , 2024\n" "Language-Team: Romanian (https://app.transifex.com/hisp-uio/teams/100509/ro/)\n" @@ -198,15 +198,15 @@ msgstr "Utilizatorul atribuit" msgid "Search for user" msgstr "Căutare utilizator" +msgid "Notes" +msgstr "" + msgid "Basic info" msgstr "Informații de bază" msgid "Status" msgstr "Stare" -msgid "Comments" -msgstr "Comentarii" - msgid "Relationships" msgstr "Relații" @@ -238,10 +238,8 @@ msgstr "Activ" msgid "Completed" msgstr "Complet" -msgid "Please add or cancel comment before saving the event" +msgid "Please add or cancel note before saving the event" msgstr "" -"Vă rugăm să adăugați sau să anulați comentariul înainte de a salva " -"evenimentul" msgid "Save and add another" msgstr "Salvare și adăugarea altuia" @@ -626,14 +624,14 @@ msgstr "Offline" msgid "Syncing" msgstr "Sincronizare" -msgid "Add comment" -msgstr "Adăugare comentariu" +msgid "Add note" +msgstr "" -msgid "You don't have access to write comments" +msgid "You don't have access to write notes" msgstr "" -msgid "Write comment" -msgstr "Scrieți comentariu" +msgid "Write note" +msgstr "" msgid "was blanked out and hidden by your last action" msgstr "" @@ -830,8 +828,10 @@ msgstr "Sau vedeți toate evenimentele accesibile dvs. în {{program}}" msgid "Please select an organisation unit." msgstr "Selectați o unitate organizațională." -msgid "New" -msgstr "Nou" +msgid "" +"You don't have access to create a {{trackedEntityName}} in the current " +"selections" +msgstr "" msgid "Choose the {{missingCategories}} to start reporting" msgstr "" @@ -839,8 +839,8 @@ msgstr "" msgid "Save as new" msgstr "Salvare ca nou" -msgid "View enrollment" -msgstr "Vizualizare înrolare" +msgid "New" +msgstr "Nou" msgid "Create for" msgstr "Creare pentru" @@ -1149,9 +1149,6 @@ msgid "" "program. All activity will be logged." msgstr "" -msgid "Save comment" -msgstr "Salvare comentariu" - msgid "Enrollment actions" msgstr "Acțiuni de înrolare" @@ -1271,14 +1268,8 @@ msgstr "" msgid "Add area" msgstr "" -msgid "Comments about this enrollment" -msgstr "Comentarii despre această înrolare" - -msgid "Write a comment about this enrollment" -msgstr "Scrierea unui comentariu despre această înrolare" - -msgid "This enrollment doesn't have any comments" -msgstr "Această înrolare nu are niciun comentariu" +msgid "Please add or cancel the note before saving the event" +msgstr "" msgid "organisation unit could not be retrieved. Please try again later." msgstr "" @@ -1289,21 +1280,21 @@ msgstr "" msgid "program or stage is invalid" msgstr "programul sau etapa este nevalidă" +msgid "Notes about this enrollment" +msgstr "" + +msgid "Write a note about this enrollment" +msgstr "" + +msgid "This enrollment doesn't have any notes" +msgstr "" + msgid "Error" msgstr "Eroare" msgid "Warning" msgstr "Avertizare" -msgid "Comments about this event" -msgstr "Comentarii despre acest eveniment" - -msgid "Write a comment about this event" -msgstr "Scrierea unui comentariu despre acest eveniment" - -msgid "This event doesn't have any comments" -msgstr "Acest eveniment nu are comentarii" - msgid "stage not found in rules execution" msgstr "" @@ -1325,6 +1316,15 @@ msgstr "Eveniment finalizat" msgid "Back to all stages and events" msgstr "Înapoi la toate etapele și evenimentele" +msgid "Notes about this event" +msgstr "" + +msgid "Write a note about this event" +msgstr "" + +msgid "This event doesn't have any notes" +msgstr "" + msgid "Schedule date info" msgstr "" @@ -1365,10 +1365,13 @@ msgstr "" msgid "Schedule date / Due date" msgstr "" -msgid "Event comments" -msgstr "Comentarii la eveniment" +msgid "Event notes" +msgstr "" + +msgid "Write a note about this scheduled event" +msgstr "" -msgid "Write a comment about this scheduled event" +msgid "Save note" msgstr "" msgid "" @@ -1435,6 +1438,12 @@ msgstr "" msgid "Choose a {{linkableStageLabel}}" msgstr "" +msgid "{{ linkableStageLabel }} is not repeatable" +msgstr "" + +msgid "{{ linkableStageLabel }} has no linkable events" +msgstr "" + msgid "Ambiguous relationships, contact system administrator" msgstr "" diff --git a/i18n/ru.po b/i18n/ru.po index a11457ca0d..61b684be1c 100644 --- a/i18n/ru.po +++ b/i18n/ru.po @@ -1,17 +1,17 @@ -# +# # Translators: # Ulanbek Abakirov , 2020 # Wanda , 2021 # Viktor Varland , 2023 -# Philip Larsen Donnelly, 2024 # Yury Rogachev , 2024 -# +# Philip Larsen Donnelly, 2024 +# msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-04-12T20:48:54.429Z\n" +"POT-Creation-Date: 2024-06-28T11:23:02.970Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" -"Last-Translator: Yury Rogachev , 2024\n" +"Last-Translator: Philip Larsen Donnelly, 2024\n" "Language-Team: Russian (https://app.transifex.com/hisp-uio/teams/100509/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,9 +22,6 @@ msgstr "" msgid "Choose one or more dates..." msgstr "Выбрать одну или несколько дат..." -msgid "Clear selections" -msgstr "Очистить выбор" - msgid "Choose a date..." msgstr "Выбрать дату..." @@ -203,15 +200,15 @@ msgstr "Назначенный пользователь" msgid "Search for user" msgstr "Поиск пользователя" +msgid "Notes" +msgstr "Заметки" + msgid "Basic info" msgstr "Основные данные" msgid "Status" msgstr "Статус" -msgid "Comments" -msgstr "Комментарии" - msgid "Relationships" msgstr "Связи" @@ -244,8 +241,8 @@ msgstr "Активный/ая/ое" msgid "Completed" msgstr "Завершен/а/о" -msgid "Please add or cancel comment before saving the event" -msgstr "Добавьте или отмените комментарии перед сохранением события" +msgid "Please add or cancel note before saving the event" +msgstr "" msgid "Save and add another" msgstr "Сохранить и добавить другую запись" @@ -639,14 +636,14 @@ msgstr "Оффлайн" msgid "Syncing" msgstr "Синхронизация" -msgid "Add comment" -msgstr "Добавить комментарий" +msgid "Add note" +msgstr "Добавить заметку" -msgid "You don't have access to write comments" -msgstr "У вас нет доступа к написанию комментариев" +msgid "You don't have access to write notes" +msgstr "" -msgid "Write comment" -msgstr "Написать комментарий" +msgid "Write note" +msgstr "" msgid "was blanked out and hidden by your last action" msgstr "- удалено и скрыто вашим последним действием" @@ -871,8 +868,10 @@ msgstr "Или посмотреть все события, доступные в msgid "Please select an organisation unit." msgstr "Выберите организационную единицу." -msgid "New" -msgstr "Новый/ая/ое" +msgid "" +"You don't have access to create a {{trackedEntityName}} in the current " +"selections" +msgstr "" msgid "Choose the {{missingCategories}} to start reporting" msgstr "Выберите {{missingCategories}}, чтобы начать ввод данных." @@ -880,8 +879,8 @@ msgstr "Выберите {{missingCategories}}, чтобы начать ввод msgid "Save as new" msgstr "Сохранить как новый/ую/ое" -msgid "View enrollment" -msgstr "Посмотреть регистрационную запись" +msgid "New" +msgstr "Новый/ая/ое" msgid "Create for" msgstr "Создать для" @@ -1201,9 +1200,6 @@ msgstr "" "Вы должны указать причину проверки регистрационных записей в данной " "защищенной программе. Все действия будут регистрироваться." -msgid "Save comment" -msgstr "Сохранить комментарий" - msgid "Enrollment actions" msgstr "Действия с регистрационной записью" @@ -1337,14 +1333,8 @@ msgstr "Добавить координаты" msgid "Add area" msgstr "Добавить участок" -msgid "Comments about this enrollment" -msgstr "Комментарии о данной регистрационной записи" - -msgid "Write a comment about this enrollment" -msgstr "Добавить комментарий о данной регистрационной записи" - -msgid "This enrollment doesn't have any comments" -msgstr "У данной регистрационной записи нет комментариев" +msgid "Please add or cancel the note before saving the event" +msgstr "" msgid "organisation unit could not be retrieved. Please try again later." msgstr "" @@ -1358,21 +1348,21 @@ msgstr "" msgid "program or stage is invalid" msgstr "программа или этап недействительны" +msgid "Notes about this enrollment" +msgstr "" + +msgid "Write a note about this enrollment" +msgstr "" + +msgid "This enrollment doesn't have any notes" +msgstr "" + msgid "Error" msgstr "Ошибка" msgid "Warning" msgstr "Предупреждение" -msgid "Comments about this event" -msgstr "Комментарии о данном событии" - -msgid "Write a comment about this event" -msgstr "Добавить комментарий о данном событии" - -msgid "This event doesn't have any comments" -msgstr "У данного события нет комментариев" - msgid "stage not found in rules execution" msgstr "этап не найден при выполнении правил" @@ -1396,6 +1386,15 @@ msgstr "Событие завершено" msgid "Back to all stages and events" msgstr "Обратно ко всем этапам и событиям" +msgid "Notes about this event" +msgstr "" + +msgid "Write a note about this event" +msgstr "" + +msgid "This event doesn't have any notes" +msgstr "" + msgid "Schedule date info" msgstr "Информация о запланированной дате" @@ -1454,11 +1453,14 @@ msgstr "Информация о расписании" msgid "Schedule date / Due date" msgstr "Запланированная дата / Дата выполнения" -msgid "Event comments" -msgstr "Комментарии к событию" +msgid "Event notes" +msgstr "" + +msgid "Write a note about this scheduled event" +msgstr "" -msgid "Write a comment about this scheduled event" -msgstr "Добавить комментарий о данном запланированном событии" +msgid "Save note" +msgstr "Сохранить заметку" msgid "" "Change information about this {{trackedEntityName}} here. To change " @@ -1531,6 +1533,12 @@ msgstr "Создать связку с существующим этапом {{l msgid "Choose a {{linkableStageLabel}}" msgstr "Выбрать этап {{linkableStageLabel}}" +msgid "{{ linkableStageLabel }} is not repeatable" +msgstr "" + +msgid "{{ linkableStageLabel }} has no linkable events" +msgstr "" + msgid "Ambiguous relationships, contact system administrator" msgstr "Неопределенные связи, обратитесь к системному администратору" diff --git a/i18n/tg.po b/i18n/tg.po index f2bcb6e952..1114b6612b 100644 --- a/i18n/tg.po +++ b/i18n/tg.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-04-05T13:37:32.910Z\n" +"POT-Creation-Date: 2024-06-28T11:23:02.970Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Viktor Varland , 2024\n" "Language-Team: Tajik (https://app.transifex.com/hisp-uio/teams/100509/tg/)\n" @@ -190,15 +190,15 @@ msgstr "" msgid "Search for user" msgstr "" +msgid "Notes" +msgstr "" + msgid "Basic info" msgstr "" msgid "Status" msgstr "Ҳолат" -msgid "Comments" -msgstr "" - msgid "Relationships" msgstr "" @@ -227,7 +227,7 @@ msgstr "Фаъол" msgid "Completed" msgstr "Анҷомёфта" -msgid "Please add or cancel comment before saving the event" +msgid "Please add or cancel note before saving the event" msgstr "" msgid "Save and add another" @@ -598,7 +598,7 @@ msgstr "" msgid "Program doesn't exist" msgstr "" -msgid "Selected program is invalid for selected registering unit" +msgid "Selected program is invalid for selected organisation unit" msgstr "" msgid "Online" @@ -610,13 +610,13 @@ msgstr "Офлайн" msgid "Syncing" msgstr "" -msgid "Add comment" +msgid "Add note" msgstr "" -msgid "You don't have access to write comments" +msgid "You don't have access to write notes" msgstr "" -msgid "Write comment" +msgid "Write note" msgstr "" msgid "was blanked out and hidden by your last action" @@ -763,7 +763,7 @@ msgstr "" msgid "There was an error loading the page" msgstr "" -msgid "Choose a registering unit to start reporting" +msgid "Choose an organisation unit to start reporting" msgstr "" msgid "No feedback for this event yet" @@ -814,8 +814,10 @@ msgstr "" msgid "Please select an organisation unit." msgstr "" -msgid "New" -msgstr "Нав" +msgid "" +"You don't have access to create a {{trackedEntityName}} in the current " +"selections" +msgstr "" msgid "Choose the {{missingCategories}} to start reporting" msgstr "" @@ -823,8 +825,8 @@ msgstr "" msgid "Save as new" msgstr "" -msgid "View enrollment" -msgstr "" +msgid "New" +msgstr "Нав" msgid "Create for" msgstr "" @@ -972,10 +974,7 @@ msgstr "" msgid "No results found for " msgstr "" -msgid "Registering unit" -msgstr "" - -msgid "Choose a registering unit" +msgid "Choose an organisation unit" msgstr "" msgid "Clear selection" @@ -987,7 +986,7 @@ msgstr "" msgid "Search for a program" msgstr "" -msgid "Some programs are being filtered by the chosen registering unit" +msgid "Some programs are being filtered by the chosen organisation unit" msgstr "" msgid "Show all programs" @@ -1089,6 +1088,9 @@ msgstr "" msgid "Search for a {{trackedEntityName}} in {{programName}}" msgstr "" +msgid "No tracked entity types available" +msgstr "" + msgid "Assigned to" msgstr "таъиншуда ба" @@ -1126,9 +1128,6 @@ msgid "" "program. All activity will be logged." msgstr "" -msgid "Save comment" -msgstr "Захира кардани шарҳ" - msgid "Enrollment actions" msgstr "" @@ -1248,22 +1247,25 @@ msgstr "" msgid "Add area" msgstr "" -msgid "Comments about this enrollment" +msgid "Please add or cancel the note before saving the event" msgstr "" -msgid "Write a comment about this enrollment" +msgid "organisation unit could not be retrieved. Please try again later." msgstr "" -msgid "This enrollment doesn't have any comments" +msgid "Saving to {{stageName}} for {{programName}} in {{orgUnitName}}" msgstr "" -msgid "organisation unit could not be retrieved. Please try again later." +msgid "program or stage is invalid" msgstr "" -msgid "Saving to {{stageName}} for {{programName}} in {{orgUnitName}}" +msgid "Notes about this enrollment" msgstr "" -msgid "program or stage is invalid" +msgid "Write a note about this enrollment" +msgstr "" + +msgid "This enrollment doesn't have any notes" msgstr "" msgid "Error" @@ -1272,15 +1274,6 @@ msgstr "Хатогӣ" msgid "Warning" msgstr "Огоҳӣ" -msgid "Comments about this event" -msgstr "" - -msgid "Write a comment about this event" -msgstr "" - -msgid "This event doesn't have any comments" -msgstr "" - msgid "stage not found in rules execution" msgstr "" @@ -1302,6 +1295,15 @@ msgstr "" msgid "Back to all stages and events" msgstr "" +msgid "Notes about this event" +msgstr "" + +msgid "Write a note about this event" +msgstr "" + +msgid "This event doesn't have any notes" +msgstr "" + msgid "Schedule date info" msgstr "" @@ -1340,10 +1342,13 @@ msgstr "" msgid "Schedule date / Due date" msgstr "" -msgid "Event comments" +msgid "Event notes" +msgstr "" + +msgid "Write a note about this scheduled event" msgstr "" -msgid "Write a comment about this scheduled event" +msgid "Save note" msgstr "" msgid "" @@ -1409,6 +1414,12 @@ msgstr "" msgid "Choose a {{linkableStageLabel}}" msgstr "" +msgid "{{ linkableStageLabel }} is not repeatable" +msgstr "" + +msgid "{{ linkableStageLabel }} has no linkable events" +msgstr "" + msgid "Ambiguous relationships, contact system administrator" msgstr "" diff --git a/i18n/uk.po b/i18n/uk.po index 344ef66972..2e6b4b8122 100644 --- a/i18n/uk.po +++ b/i18n/uk.po @@ -2,16 +2,16 @@ # Translators: # Philip Larsen Donnelly, 2023 # Wanda , 2024 -# Nadiia , 2024 # Éva Tamási, 2024 # Viktor Varland , 2024 +# Nadiia , 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-04-12T20:48:54.429Z\n" +"POT-Creation-Date: 2024-06-28T11:23:02.970Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" -"Last-Translator: Viktor Varland , 2024\n" +"Last-Translator: Nadiia , 2024\n" "Language-Team: Ukrainian (https://app.transifex.com/hisp-uio/teams/100509/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -193,15 +193,15 @@ msgstr "Призначений користувач" msgid "Search for user" msgstr "" +msgid "Notes" +msgstr "Примітки" + msgid "Basic info" msgstr "" msgid "Status" msgstr "Статус" -msgid "Comments" -msgstr "Коментарі" - msgid "Relationships" msgstr "Зв'язки" @@ -230,7 +230,7 @@ msgstr "Активне" msgid "Completed" msgstr "Завершено" -msgid "Please add or cancel comment before saving the event" +msgid "Please add or cancel note before saving the event" msgstr "" msgid "Save and add another" @@ -615,13 +615,13 @@ msgstr "Офлайн" msgid "Syncing" msgstr "" -msgid "Add comment" -msgstr "" +msgid "Add note" +msgstr "Додати нотатку" -msgid "You don't have access to write comments" +msgid "You don't have access to write notes" msgstr "" -msgid "Write comment" +msgid "Write note" msgstr "" msgid "was blanked out and hidden by your last action" @@ -819,8 +819,10 @@ msgstr "" msgid "Please select an organisation unit." msgstr "" -msgid "New" -msgstr "Нове" +msgid "" +"You don't have access to create a {{trackedEntityName}} in the current " +"selections" +msgstr "" msgid "Choose the {{missingCategories}} to start reporting" msgstr "" @@ -828,8 +830,8 @@ msgstr "" msgid "Save as new" msgstr "" -msgid "View enrollment" -msgstr "" +msgid "New" +msgstr "Нове" msgid "Create for" msgstr "" @@ -1133,9 +1135,6 @@ msgid "" "program. All activity will be logged." msgstr "" -msgid "Save comment" -msgstr "Зберегти коментар" - msgid "Enrollment actions" msgstr "" @@ -1255,22 +1254,25 @@ msgstr "" msgid "Add area" msgstr "" -msgid "Comments about this enrollment" +msgid "Please add or cancel the note before saving the event" msgstr "" -msgid "Write a comment about this enrollment" +msgid "organisation unit could not be retrieved. Please try again later." msgstr "" -msgid "This enrollment doesn't have any comments" +msgid "Saving to {{stageName}} for {{programName}} in {{orgUnitName}}" msgstr "" -msgid "organisation unit could not be retrieved. Please try again later." +msgid "program or stage is invalid" msgstr "" -msgid "Saving to {{stageName}} for {{programName}} in {{orgUnitName}}" +msgid "Notes about this enrollment" msgstr "" -msgid "program or stage is invalid" +msgid "Write a note about this enrollment" +msgstr "" + +msgid "This enrollment doesn't have any notes" msgstr "" msgid "Error" @@ -1279,15 +1281,6 @@ msgstr "Помилка" msgid "Warning" msgstr "Попередження" -msgid "Comments about this event" -msgstr "" - -msgid "Write a comment about this event" -msgstr "" - -msgid "This event doesn't have any comments" -msgstr "" - msgid "stage not found in rules execution" msgstr "" @@ -1309,6 +1302,15 @@ msgstr "" msgid "Back to all stages and events" msgstr "" +msgid "Notes about this event" +msgstr "" + +msgid "Write a note about this event" +msgstr "" + +msgid "This event doesn't have any notes" +msgstr "" + msgid "Schedule date info" msgstr "" @@ -1351,12 +1353,15 @@ msgstr "" msgid "Schedule date / Due date" msgstr "" -msgid "Event comments" +msgid "Event notes" msgstr "" -msgid "Write a comment about this scheduled event" +msgid "Write a note about this scheduled event" msgstr "" +msgid "Save note" +msgstr "Зберегти нотатку" + msgid "" "Change information about this {{trackedEntityName}} here. To change " "information about this enrollment, use the Edit button in the in the " @@ -1420,6 +1425,12 @@ msgstr "" msgid "Choose a {{linkableStageLabel}}" msgstr "" +msgid "{{ linkableStageLabel }} is not repeatable" +msgstr "" + +msgid "{{ linkableStageLabel }} has no linkable events" +msgstr "" + msgid "Ambiguous relationships, contact system administrator" msgstr "" diff --git a/i18n/ur.po b/i18n/ur.po index ae43a77d02..3dc7473907 100644 --- a/i18n/ur.po +++ b/i18n/ur.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-04-12T20:48:54.429Z\n" +"POT-Creation-Date: 2024-06-28T11:23:02.970Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Viktor Varland , 2024\n" "Language-Team: Urdu (https://app.transifex.com/hisp-uio/teams/100509/ur/)\n" @@ -190,15 +190,15 @@ msgstr "" msgid "Search for user" msgstr "" +msgid "Notes" +msgstr "نوٹس" + msgid "Basic info" msgstr "" msgid "Status" msgstr "حالت" -msgid "Comments" -msgstr "تبصرے" - msgid "Relationships" msgstr "تعلقات" @@ -227,7 +227,7 @@ msgstr "فعال" msgid "Completed" msgstr "مکمل" -msgid "Please add or cancel comment before saving the event" +msgid "Please add or cancel note before saving the event" msgstr "" msgid "Save and add another" @@ -610,13 +610,13 @@ msgstr "آف لائن" msgid "Syncing" msgstr "" -msgid "Add comment" -msgstr "" +msgid "Add note" +msgstr "نوٹ شامل" -msgid "You don't have access to write comments" +msgid "You don't have access to write notes" msgstr "" -msgid "Write comment" +msgid "Write note" msgstr "" msgid "was blanked out and hidden by your last action" @@ -814,8 +814,10 @@ msgstr "" msgid "Please select an organisation unit." msgstr "" -msgid "New" -msgstr "نیا" +msgid "" +"You don't have access to create a {{trackedEntityName}} in the current " +"selections" +msgstr "" msgid "Choose the {{missingCategories}} to start reporting" msgstr "" @@ -823,8 +825,8 @@ msgstr "" msgid "Save as new" msgstr "" -msgid "View enrollment" -msgstr "" +msgid "New" +msgstr "نیا" msgid "Create for" msgstr "" @@ -1126,9 +1128,6 @@ msgid "" "program. All activity will be logged." msgstr "" -msgid "Save comment" -msgstr "" - msgid "Enrollment actions" msgstr "" @@ -1248,22 +1247,25 @@ msgstr "" msgid "Add area" msgstr "" -msgid "Comments about this enrollment" +msgid "Please add or cancel the note before saving the event" msgstr "" -msgid "Write a comment about this enrollment" +msgid "organisation unit could not be retrieved. Please try again later." msgstr "" -msgid "This enrollment doesn't have any comments" +msgid "Saving to {{stageName}} for {{programName}} in {{orgUnitName}}" msgstr "" -msgid "organisation unit could not be retrieved. Please try again later." +msgid "program or stage is invalid" msgstr "" -msgid "Saving to {{stageName}} for {{programName}} in {{orgUnitName}}" +msgid "Notes about this enrollment" msgstr "" -msgid "program or stage is invalid" +msgid "Write a note about this enrollment" +msgstr "" + +msgid "This enrollment doesn't have any notes" msgstr "" msgid "Error" @@ -1272,15 +1274,6 @@ msgstr "غلطی" msgid "Warning" msgstr "وارنگ" -msgid "Comments about this event" -msgstr "" - -msgid "Write a comment about this event" -msgstr "" - -msgid "This event doesn't have any comments" -msgstr "" - msgid "stage not found in rules execution" msgstr "" @@ -1302,6 +1295,15 @@ msgstr "" msgid "Back to all stages and events" msgstr "" +msgid "Notes about this event" +msgstr "" + +msgid "Write a note about this event" +msgstr "" + +msgid "This event doesn't have any notes" +msgstr "" + msgid "Schedule date info" msgstr "" @@ -1340,12 +1342,15 @@ msgstr "" msgid "Schedule date / Due date" msgstr "" -msgid "Event comments" +msgid "Event notes" msgstr "" -msgid "Write a comment about this scheduled event" +msgid "Write a note about this scheduled event" msgstr "" +msgid "Save note" +msgstr "نوٹ محفوظ کریں" + msgid "" "Change information about this {{trackedEntityName}} here. To change " "information about this enrollment, use the Edit button in the in the " @@ -1409,6 +1414,12 @@ msgstr "" msgid "Choose a {{linkableStageLabel}}" msgstr "" +msgid "{{ linkableStageLabel }} is not repeatable" +msgstr "" + +msgid "{{ linkableStageLabel }} has no linkable events" +msgstr "" + msgid "Ambiguous relationships, contact system administrator" msgstr "" diff --git a/i18n/vi.po b/i18n/vi.po index c72f08d33b..1b1f6ad6f1 100644 --- a/i18n/vi.po +++ b/i18n/vi.po @@ -1,14 +1,14 @@ # # Translators: -# Thuy Nguyen , 2023 # Philip Larsen Donnelly, 2024 # Mai Nguyen , 2024 +# Thuy Nguyen , 2024 # Viktor Varland , 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-04-12T20:48:54.429Z\n" +"POT-Creation-Date: 2024-06-28T11:23:02.970Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Viktor Varland , 2024\n" "Language-Team: Vietnamese (https://app.transifex.com/hisp-uio/teams/100509/vi/)\n" @@ -198,15 +198,15 @@ msgstr "Người dùng được chỉ định" msgid "Search for user" msgstr "Tìm kiếm người dùng" +msgid "Notes" +msgstr "Ghi Chú" + msgid "Basic info" msgstr "Thông tin cơ bản" msgid "Status" msgstr "Tình trạng" -msgid "Comments" -msgstr "Bình luận" - msgid "Relationships" msgstr "Mối quan hệ" @@ -237,8 +237,8 @@ msgstr "Hoạt động" msgid "Completed" msgstr "Hoàn tất" -msgid "Please add or cancel comment before saving the event" -msgstr "Xin vui lòng thêm hoặc xóa bình luận trước khi lưu sự kiện" +msgid "Please add or cancel note before saving the event" +msgstr "" msgid "Save and add another" msgstr "Lưu và thêm sự kiện khác" @@ -625,14 +625,14 @@ msgstr "Ngoại tuyến" msgid "Syncing" msgstr "Đang đồng bộ" -msgid "Add comment" -msgstr "Thêm bình luận" +msgid "Add note" +msgstr "Thêm ghi chú" -msgid "You don't have access to write comments" +msgid "You don't have access to write notes" msgstr "" -msgid "Write comment" -msgstr "Viết bình luận" +msgid "Write note" +msgstr "" msgid "was blanked out and hidden by your last action" msgstr "" @@ -829,8 +829,10 @@ msgstr "" msgid "Please select an organisation unit." msgstr "" -msgid "New" -msgstr "Mới" +msgid "" +"You don't have access to create a {{trackedEntityName}} in the current " +"selections" +msgstr "" msgid "Choose the {{missingCategories}} to start reporting" msgstr "Chọn {{missingCategories}} để bắt đầu báo cáo" @@ -838,8 +840,8 @@ msgstr "Chọn {{missingCategories}} để bắt đầu báo cáo" msgid "Save as new" msgstr "" -msgid "View enrollment" -msgstr "" +msgid "New" +msgstr "Mới" msgid "Create for" msgstr "" @@ -1148,9 +1150,6 @@ msgid "" "program. All activity will be logged." msgstr "" -msgid "Save comment" -msgstr "Lưu chú thích" - msgid "Enrollment actions" msgstr "" @@ -1270,22 +1269,25 @@ msgstr "" msgid "Add area" msgstr "" -msgid "Comments about this enrollment" +msgid "Please add or cancel the note before saving the event" msgstr "" -msgid "Write a comment about this enrollment" +msgid "organisation unit could not be retrieved. Please try again later." msgstr "" -msgid "This enrollment doesn't have any comments" +msgid "Saving to {{stageName}} for {{programName}} in {{orgUnitName}}" msgstr "" -msgid "organisation unit could not be retrieved. Please try again later." +msgid "program or stage is invalid" msgstr "" -msgid "Saving to {{stageName}} for {{programName}} in {{orgUnitName}}" +msgid "Notes about this enrollment" msgstr "" -msgid "program or stage is invalid" +msgid "Write a note about this enrollment" +msgstr "" + +msgid "This enrollment doesn't have any notes" msgstr "" msgid "Error" @@ -1294,15 +1296,6 @@ msgstr "Lỗi" msgid "Warning" msgstr "Cảnh báo" -msgid "Comments about this event" -msgstr "" - -msgid "Write a comment about this event" -msgstr "" - -msgid "This event doesn't have any comments" -msgstr "" - msgid "stage not found in rules execution" msgstr "" @@ -1324,6 +1317,15 @@ msgstr "" msgid "Back to all stages and events" msgstr "" +msgid "Notes about this event" +msgstr "" + +msgid "Write a note about this event" +msgstr "" + +msgid "This event doesn't have any notes" +msgstr "" + msgid "Schedule date info" msgstr "" @@ -1360,12 +1362,15 @@ msgstr "" msgid "Schedule date / Due date" msgstr "" -msgid "Event comments" +msgid "Event notes" msgstr "" -msgid "Write a comment about this scheduled event" +msgid "Write a note about this scheduled event" msgstr "" +msgid "Save note" +msgstr "Lưu ghi chú" + msgid "" "Change information about this {{trackedEntityName}} here. To change " "information about this enrollment, use the Edit button in the in the " @@ -1429,6 +1434,12 @@ msgstr "" msgid "Choose a {{linkableStageLabel}}" msgstr "" +msgid "{{ linkableStageLabel }} is not repeatable" +msgstr "" + +msgid "{{ linkableStageLabel }} has no linkable events" +msgstr "" + msgid "Ambiguous relationships, contact system administrator" msgstr "" diff --git a/i18n/zh.po b/i18n/zh.po index eb43c62ac6..b20b4c7be4 100644 --- a/i18n/zh.po +++ b/i18n/zh.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-04-12T20:48:54.429Z\n" +"POT-Creation-Date: 2024-06-28T11:23:02.970Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: easylin , 2024\n" "Language-Team: Chinese (https://app.transifex.com/hisp-uio/teams/100509/zh/)\n" @@ -194,15 +194,15 @@ msgstr "分配的用户" msgid "Search for user" msgstr "搜索用户 " +msgid "Notes" +msgstr "笔记" + msgid "Basic info" msgstr "基本信息" msgid "Status" msgstr "状态" -msgid "Comments" -msgstr "评论" - msgid "Relationships" msgstr "关系" @@ -231,8 +231,8 @@ msgstr "活动的" msgid "Completed" msgstr "已完成" -msgid "Please add or cancel comment before saving the event" -msgstr "保存事件前请添加或取消被或许" +msgid "Please add or cancel note before saving the event" +msgstr "" msgid "Save and add another" msgstr "保存并另外添加" @@ -613,14 +613,14 @@ msgstr "离线" msgid "Syncing" msgstr "同步" -msgid "Add comment" -msgstr "添加备注" +msgid "Add note" +msgstr "添加笔记" -msgid "You don't have access to write comments" -msgstr "您无权撰写评论" +msgid "You don't have access to write notes" +msgstr "" -msgid "Write comment" -msgstr "写备注" +msgid "Write note" +msgstr "" msgid "was blanked out and hidden by your last action" msgstr "被你的最后一个动作清空并隐藏" @@ -820,8 +820,10 @@ msgstr "或者在{{program}}中查看您可以访问的所有事件" msgid "Please select an organisation unit." msgstr "请选择一个组织单位。" -msgid "New" -msgstr "新建" +msgid "" +"You don't have access to create a {{trackedEntityName}} in the current " +"selections" +msgstr "您没有权限在当前选择中创建{{trackedEntityName}} " msgid "Choose the {{missingCategories}} to start reporting" msgstr "选择{{missingCategories}}开始报告" @@ -829,8 +831,8 @@ msgstr "选择{{missingCategories}}开始报告" msgid "Save as new" msgstr "另存为新" -msgid "View enrollment" -msgstr "查看报名" +msgid "New" +msgstr "新建" msgid "Create for" msgstr "为创建" @@ -1133,9 +1135,6 @@ msgid "" "program. All activity will be logged." msgstr "您必须提供一个理由来检查此受保护计划的注册情况。所有活动都将被记录。" -msgid "Save comment" -msgstr "保存注释" - msgid "Enrollment actions" msgstr "报名操作" @@ -1255,14 +1254,8 @@ msgstr "添加坐标" msgid "Add area" msgstr "添加区域" -msgid "Comments about this enrollment" -msgstr "关于本次报名的评论" - -msgid "Write a comment about this enrollment" -msgstr "写一篇关于这个报名的评论" - -msgid "This enrollment doesn't have any comments" -msgstr "本次报名没有任何评论" +msgid "Please add or cancel the note before saving the event" +msgstr "" msgid "organisation unit could not be retrieved. Please try again later." msgstr "无法检索组织机构。请稍后再试。" @@ -1273,21 +1266,21 @@ msgstr "为 {{orgUnitName}} 中的 {{programName}} 保存到 {{stageName}}" msgid "program or stage is invalid" msgstr "项目或阶段无效" +msgid "Notes about this enrollment" +msgstr "" + +msgid "Write a note about this enrollment" +msgstr "" + +msgid "This enrollment doesn't have any notes" +msgstr "" + msgid "Error" msgstr "错误" msgid "Warning" msgstr "警告" -msgid "Comments about this event" -msgstr "对本次事件的评论" - -msgid "Write a comment about this event" -msgstr "写一篇关于该事件的评论" - -msgid "This event doesn't have any comments" -msgstr "此事件没有任何评论" - msgid "stage not found in rules execution" msgstr "在规则执行中找不到阶段" @@ -1309,6 +1302,15 @@ msgstr "事件完成" msgid "Back to all stages and events" msgstr "回到所有阶段和事件" +msgid "Notes about this event" +msgstr "" + +msgid "Write a note about this event" +msgstr "" + +msgid "This event doesn't have any notes" +msgstr "" + msgid "Schedule date info" msgstr "预定日期信息" @@ -1345,11 +1347,14 @@ msgstr "日程信息" msgid "Schedule date / Due date" msgstr "计划日期/截止日期" -msgid "Event comments" -msgstr "事件评论、注释" +msgid "Event notes" +msgstr "" + +msgid "Write a note about this scheduled event" +msgstr "" -msgid "Write a comment about this scheduled event" -msgstr "写一篇关于这个预定事件的评论" +msgid "Save note" +msgstr "保存笔记" msgid "" "Change information about this {{trackedEntityName}} here. To change " @@ -1416,6 +1421,12 @@ msgstr "链接到现有的 {{linkableStageLabel}}" msgid "Choose a {{linkableStageLabel}}" msgstr "选择 {{linkableStageLabel}}" +msgid "{{ linkableStageLabel }} is not repeatable" +msgstr "" + +msgid "{{ linkableStageLabel }} has no linkable events" +msgstr "" + msgid "Ambiguous relationships, contact system administrator" msgstr "关系不明确，请联系系统管理员" diff --git a/i18n/zh_CN.po b/i18n/zh_CN.po index b258050cd2..f9a0825457 100644 --- a/i18n/zh_CN.po +++ b/i18n/zh_CN.po @@ -1,15 +1,15 @@ # # Translators: # Philip Larsen Donnelly, 2024 -# 晓东 林 <13981924470@126.com>, 2024 # easylin , 2024 +# 晓东 林 <13981924470@126.com>, 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-04-12T20:48:54.429Z\n" +"POT-Creation-Date: 2024-06-28T11:23:02.970Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" -"Last-Translator: easylin , 2024\n" +"Last-Translator: 晓东 林 <13981924470@126.com>, 2024\n" "Language-Team: Chinese (China) (https://app.transifex.com/hisp-uio/teams/100509/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -193,15 +193,15 @@ msgstr "分配的用户" msgid "Search for user" msgstr "搜索用户 " +msgid "Notes" +msgstr "笔记" + msgid "Basic info" msgstr "基本信息" msgid "Status" msgstr "状态" -msgid "Comments" -msgstr "评论" - msgid "Relationships" msgstr "关系" @@ -230,8 +230,8 @@ msgstr "活动的" msgid "Completed" msgstr "已完成" -msgid "Please add or cancel comment before saving the event" -msgstr "保存事件前请添加或取消被或许" +msgid "Please add or cancel note before saving the event" +msgstr "" msgid "Save and add another" msgstr "保存并另外添加" @@ -612,14 +612,14 @@ msgstr "离线" msgid "Syncing" msgstr "同步" -msgid "Add comment" -msgstr "添加备注" +msgid "Add note" +msgstr "添加笔记" -msgid "You don't have access to write comments" -msgstr "您无权发表评论" +msgid "You don't have access to write notes" +msgstr "" -msgid "Write comment" -msgstr "写备注" +msgid "Write note" +msgstr "" msgid "was blanked out and hidden by your last action" msgstr "被你的最后一个动作清空并隐藏" @@ -819,8 +819,10 @@ msgstr "或者在{{program}}中查看您可以访问的所有事件" msgid "Please select an organisation unit." msgstr "请选择一个组织单位。" -msgid "New" -msgstr "新建" +msgid "" +"You don't have access to create a {{trackedEntityName}} in the current " +"selections" +msgstr "" msgid "Choose the {{missingCategories}} to start reporting" msgstr "选择{{missingCategories}}开始报告" @@ -828,8 +830,8 @@ msgstr "选择{{missingCategories}}开始报告" msgid "Save as new" msgstr "另存为新" -msgid "View enrollment" -msgstr "查看报名" +msgid "New" +msgstr "新建" msgid "Create for" msgstr "为创建" @@ -1132,9 +1134,6 @@ msgid "" "program. All activity will be logged." msgstr "您必须提供一个理由来检查此受保护计划的注册情况。所有活动都将被记录。" -msgid "Save comment" -msgstr "保存注释" - msgid "Enrollment actions" msgstr "报名操作" @@ -1254,14 +1253,8 @@ msgstr "" msgid "Add area" msgstr "" -msgid "Comments about this enrollment" -msgstr "关于本次报名的评论" - -msgid "Write a comment about this enrollment" -msgstr "写一篇关于这个报名的评论" - -msgid "This enrollment doesn't have any comments" -msgstr "本次报名没有任何评论" +msgid "Please add or cancel the note before saving the event" +msgstr "" msgid "organisation unit could not be retrieved. Please try again later." msgstr "无法检索组织机构。请稍后再试。" @@ -1272,21 +1265,21 @@ msgstr "为 {{orgUnitName}} 中的 {{programName}} 保存到 {{stageName}}" msgid "program or stage is invalid" msgstr "项目或阶段无效" +msgid "Notes about this enrollment" +msgstr "" + +msgid "Write a note about this enrollment" +msgstr "" + +msgid "This enrollment doesn't have any notes" +msgstr "" + msgid "Error" msgstr "错误" msgid "Warning" msgstr "警告" -msgid "Comments about this event" -msgstr "对本次事件的评论" - -msgid "Write a comment about this event" -msgstr "写一篇关于该事件的评论" - -msgid "This event doesn't have any comments" -msgstr "此事件没有任何评论" - msgid "stage not found in rules execution" msgstr "在规则执行中找不到阶段" @@ -1308,6 +1301,15 @@ msgstr "事件完成" msgid "Back to all stages and events" msgstr "回到所有阶段和事件" +msgid "Notes about this event" +msgstr "" + +msgid "Write a note about this event" +msgstr "" + +msgid "This event doesn't have any notes" +msgstr "" + msgid "Schedule date info" msgstr "预定日期信息" @@ -1344,11 +1346,14 @@ msgstr "日程信息" msgid "Schedule date / Due date" msgstr "计划日期/截止日期" -msgid "Event comments" -msgstr "事件评论、注释" +msgid "Event notes" +msgstr "" + +msgid "Write a note about this scheduled event" +msgstr "" -msgid "Write a comment about this scheduled event" -msgstr "写一篇关于这个预定事件的评论" +msgid "Save note" +msgstr "保存笔记" msgid "" "Change information about this {{trackedEntityName}} here. To change " @@ -1413,6 +1418,12 @@ msgstr "" msgid "Choose a {{linkableStageLabel}}" msgstr "" +msgid "{{ linkableStageLabel }} is not repeatable" +msgstr "" + +msgid "{{ linkableStageLabel }} has no linkable events" +msgstr "" + msgid "Ambiguous relationships, contact system administrator" msgstr "" diff --git a/package.json b/package.json index 62472e820f..f93cbf83b1 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "capture-app", "homepage": ".", - "version": "100.70.11", + "version": "100.70.14", "cacheVersion": "7", "serverVersion": "38", "license": "BSD-3-Clause", @@ -10,7 +10,7 @@ "packages/rules-engine" ], "dependencies": { - "@dhis2/rules-engine-javascript": "100.70.11", + "@dhis2/rules-engine-javascript": "100.70.14", "@dhis2/app-runtime": "^3.9.3", "@dhis2/d2-i18n": "^1.1.0", "@dhis2/d2-icons": "^1.0.1", diff --git a/packages/rules-engine/package.json b/packages/rules-engine/package.json index 423e2e306c..50f5f0948b 100644 --- a/packages/rules-engine/package.json +++ b/packages/rules-engine/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/rules-engine-javascript", - "version": "100.70.11", + "version": "100.70.14", "license": "BSD-3-Clause", "main": "./build/cjs/index.js", "scripts": { diff --git a/src/core_modules/capture-core/components/WidgetProfile/DataEntry/helpers/convertClientToView.js b/src/core_modules/capture-core/components/WidgetProfile/DataEntry/helpers/convertClientToView.js index a1b3ef942b..49d329327d 100644 --- a/src/core_modules/capture-core/components/WidgetProfile/DataEntry/helpers/convertClientToView.js +++ b/src/core_modules/capture-core/components/WidgetProfile/DataEntry/helpers/convertClientToView.js @@ -6,7 +6,7 @@ type Attribute = { attribute: string, value: string, valueType: $Keys, - optionSet: { options: Array<{ name: string, code: string }> }, + optionSet: { options: Array<{ name: string, code: string, displayName: string }> }, } export const convertClientToView = (clientAttribute: Attribute) => { @@ -20,7 +20,7 @@ export const convertClientToView = (clientAttribute: Attribute) => { const options = optionSet.options.map( option => new Option((o) => { - o.text = option.name; + o.text = option.displayName; o.value = option.code; }), ); diff --git a/src/core_modules/capture-core/components/WidgetRelatedStages/RelatedStagesActions/RelatedStagesActions.component.js b/src/core_modules/capture-core/components/WidgetRelatedStages/RelatedStagesActions/RelatedStagesActions.component.js index 82e6cf4202..4022643a6b 100644 --- a/src/core_modules/capture-core/components/WidgetRelatedStages/RelatedStagesActions/RelatedStagesActions.component.js +++ b/src/core_modules/capture-core/components/WidgetRelatedStages/RelatedStagesActions/RelatedStagesActions.component.js @@ -124,7 +124,7 @@ export const RelatedStagesActionsPlain = ({ , isLoading: boolean, @@ -49,18 +48,9 @@ export const useAvailableRelatedStageEvents = ({ if (events.length === 0) return []; - return events.reduce((acc, event) => { - if (!event.relationships) return acc; - - if (event.relationships.length === 0) acc.push(event); - - const hasRelationship = !event - .relationships - .some(relationship => relationship.relationshipType === relationshipTypeId); - if (!hasRelationship) acc.push(event); - - return acc; - }, []) + return events + .filter(event => !event.relationships || + !event.relationships.some(relationship => relationship.relationshipType === relationshipTypeId)) .map((event) => { const label = event.occurredAt ? `${occurredLabel}: ${convertDateObjectToDateFormatString(new Date(event.occurredAt))}` From d6576a5431ad422d73f01c46fb395360bd69b48e Mon Sep 17 00:00:00 2001 From: Simona Domnisoru Date: Thu, 25 Jul 2024 15:23:14 +0200 Subject: [PATCH 2/4] fix: bad request when sorting in the working lists --- .../EventWorkingLists/epics/getEventListData.js | 2 ++ .../WorkingLists/TeiWorkingLists/epics/index.js | 2 ++ .../getEventListData/getColumnsQueryArgs.js | 3 --- .../helpers/getEventListData/getEventListData.js | 6 ++++-- .../getListDataCommon/getOrderQueryArgs.js | 16 ++++++++++++++++ .../helpers/getListDataCommon/index.js | 1 + .../helpers/getTeiListData/getTeiListData.js | 9 +++++++-- .../epics/teiViewEpics/helpers/index.js | 1 + .../TeiWorkingLists/epics/teiViewEpics/index.js | 2 +- .../convertSortToClient.js | 5 +---- .../templates/buildArgumentsForTemplate.js | 3 ++- 11 files changed, 37 insertions(+), 13 deletions(-) create mode 100644 src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getListDataCommon/getOrderQueryArgs.js diff --git a/src/core_modules/capture-core/components/WorkingLists/EventWorkingLists/epics/getEventListData.js b/src/core_modules/capture-core/components/WorkingLists/EventWorkingLists/epics/getEventListData.js index 8a2a1a7e5c..7596615b31 100644 --- a/src/core_modules/capture-core/components/WorkingLists/EventWorkingLists/epics/getEventListData.js +++ b/src/core_modules/capture-core/components/WorkingLists/EventWorkingLists/epics/getEventListData.js @@ -139,6 +139,8 @@ export const createApiQueryArgs = (queryArgs: Object, mainColumns: Object, categ ...getMainApiFilterQueryArguments(queryArgs.filters, mainColumns), ...getApiCategoriesQueryArgument(queryArgs.categories, categoryCombinationId), }; + + apiQueryArgs.order.includes('default') && delete apiQueryArgs.order; apiQueryArgs.hasOwnProperty('categories') && delete apiQueryArgs.categories; apiQueryArgs.hasOwnProperty('sortById') && delete apiQueryArgs.sortById; apiQueryArgs.hasOwnProperty('sortByDirection') && delete apiQueryArgs.sortByDirection; diff --git a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/index.js b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/index.js index 1822978256..bb7be0c21f 100644 --- a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/index.js +++ b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/index.js @@ -11,4 +11,6 @@ export { deleteProgramStageTemplateEpic, updateProgramStageTemplateEpic, createApiTrackedEntitiesQueryArgs, + getOrderQueryArgs, + DEFAULT_SORT, } from './teiViewEpics'; diff --git a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getEventListData/getColumnsQueryArgs.js b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getEventListData/getColumnsQueryArgs.js index 374abdaaa1..f82b8cb2e8 100644 --- a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getEventListData/getColumnsQueryArgs.js +++ b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getEventListData/getColumnsQueryArgs.js @@ -18,6 +18,3 @@ export const getColumnsQueryArgs = ( return acc; }, []); }; - -export const getOrderQueryArgs = (sortById: string, sortByDirection: string) => - `${getFilterApiName(sortById)}:${sortByDirection}`; diff --git a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getEventListData/getEventListData.js b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getEventListData/getEventListData.js index bc9956782d..50e1b147d9 100644 --- a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getEventListData/getEventListData.js +++ b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getEventListData/getEventListData.js @@ -7,12 +7,13 @@ import { getMainApiFilterQueryArgs, getApiFilterAttributesQueryArgs, splitFilters, + getOrderQueryArgs, } from '../getListDataCommon'; import type { RawQueryArgs } from './types'; import type { InputMeta } from './getEventListData.types'; import type { TeiColumnsMetaForDataFetching, TeiFiltersOnlyMetaForDataFetching } from '../../../../types'; import { addTEIsData } from './addTEIsData'; -import { getColumnsQueryArgs, getOrderQueryArgs } from './getColumnsQueryArgs'; +import { getColumnsQueryArgs } from './getColumnsQueryArgs'; import { getScheduledDateQueryArgs } from './getScheduledDateQueryArgs'; const createApiEventQueryArgs = ( @@ -34,7 +35,7 @@ const createApiEventQueryArgs = ( ...getApiFilterQueryArgs(rawSplitFilters.filters, filtersOnlyMetaForDataFetching), ...getApiFilterAttributesQueryArgs(rawSplitFilters.filterAttributes, filtersOnlyMetaForDataFetching), ...getMainApiFilterQueryArgs(filters, filtersOnlyMetaForDataFetching), - order: getOrderQueryArgs(sortById, sortByDirection), + order: getOrderQueryArgs(sortById, sortByDirection, true), page, pageSize, orgUnit, @@ -82,6 +83,7 @@ export const getEventListData = async ( const trackedEntityIds = apiEvents .reduce((acc, { trackedEntity }) => (acc.includes(trackedEntity) ? acc : [...acc, trackedEntity]), []) + .filter(trackedEntityId => trackedEntityId) .join(';'); const { url: urlTEIs, queryParams: queryParamsTEIs } = { diff --git a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getListDataCommon/getOrderQueryArgs.js b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getListDataCommon/getOrderQueryArgs.js new file mode 100644 index 0000000000..1ea3080168 --- /dev/null +++ b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getListDataCommon/getOrderQueryArgs.js @@ -0,0 +1,16 @@ +// @flow +import { getFilterApiName } from '../../../../helpers'; + +export const DEFAULT_SORT = { + sortById: 'createdAt', + sortByDirection: 'desc', +}; + +export const getOrderQueryArgs = (sortById: string, sortByDirection: string, withAPINameConverter?: boolean) => { + const orderId = withAPINameConverter ? getFilterApiName(sortById) : sortById; + + if (sortByDirection === 'default') { + return `${DEFAULT_SORT.sortById}:${DEFAULT_SORT.sortByDirection}`; + } + return `${orderId}:${sortByDirection}`; +}; diff --git a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getListDataCommon/index.js b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getListDataCommon/index.js index ccc4a21039..39fc13e849 100644 --- a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getListDataCommon/index.js +++ b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getListDataCommon/index.js @@ -1,3 +1,4 @@ // @flow export * from './getFilterQueryArgs'; export * from './getSubvalues'; +export { getOrderQueryArgs, DEFAULT_SORT } from './getOrderQueryArgs'; diff --git a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getTeiListData/getTeiListData.js b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getTeiListData/getTeiListData.js index f5bc8cb2b8..901839a30f 100644 --- a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getTeiListData/getTeiListData.js +++ b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getTeiListData/getTeiListData.js @@ -1,7 +1,12 @@ // @flow import { handleAPIResponse, REQUESTED_ENTITIES } from 'capture-core/utils/api'; import { convertToClientTeis } from './convertToClientTeis'; -import { getSubvalues, getApiFilterQueryArgs, getMainApiFilterQueryArgs } from '../getListDataCommon'; +import { + getSubvalues, + getApiFilterQueryArgs, + getMainApiFilterQueryArgs, + getOrderQueryArgs, +} from '../getListDataCommon'; import type { RawQueryArgs } from './types'; import type { InputMeta } from './getTeiListData.types'; import type { TeiColumnsMetaForDataFetching, TeiFiltersOnlyMetaForDataFetching } from '../../../../types'; @@ -20,7 +25,7 @@ filtersOnlyMetaForDataFetching: TeiFiltersOnlyMetaForDataFetching, ): { [string]: any } => ({ ...getApiFilterQueryArgs(filters, filtersOnlyMetaForDataFetching), ...getMainApiFilterQueryArgs(filters, filtersOnlyMetaForDataFetching), - order: `${sortById}:${sortByDirection}`, + order: getOrderQueryArgs(sortById, sortByDirection, true), page, pageSize, orgUnit, diff --git a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/index.js b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/index.js index 1f3c0a20bf..b7b3f33c8f 100644 --- a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/index.js +++ b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/index.js @@ -2,3 +2,4 @@ export { initTeiWorkingListsViewAsync } from './initTeiWorkingListsView'; export { updateTeiWorkingListsRecords } from './updateTeiWorkingListsRecords'; export { createApiTrackedEntitiesQueryArgs } from './getTeiListData'; +export { getOrderQueryArgs, DEFAULT_SORT } from './getListDataCommon'; diff --git a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/index.js b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/index.js index 417e96fecb..cda19ec46d 100644 --- a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/index.js +++ b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/index.js @@ -7,4 +7,4 @@ export { updateProgramStageTemplateEpic, } from './programStageTemplates.epics'; export { retrieveAllTemplatesEpic, retrieveTEITemplatesEpic } from './retrieveTemplates.epics'; -export { createApiTrackedEntitiesQueryArgs } from './helpers'; +export { createApiTrackedEntitiesQueryArgs, getOrderQueryArgs, DEFAULT_SORT } from './helpers'; diff --git a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/helpers/TEIFilters/apiTEIFilterToClientConfigConverter/convertSortToClient.js b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/helpers/TEIFilters/apiTEIFilterToClientConfigConverter/convertSortToClient.js index 47e23dc68a..4b86718367 100644 --- a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/helpers/TEIFilters/apiTEIFilterToClientConfigConverter/convertSortToClient.js +++ b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/helpers/TEIFilters/apiTEIFilterToClientConfigConverter/convertSortToClient.js @@ -1,10 +1,7 @@ // @flow import type { TeiColumnsMetaForDataFetching } from '../../../types'; +import { DEFAULT_SORT } from '../../../epics'; -const DEFAULT_SORT = { - sortById: 'createdAt', - sortByDirection: 'desc', -}; export const convertSortOrder = (order: ?string, columnsMetaForDataFetching?: TeiColumnsMetaForDataFetching) => { const sortOrderParts = order && order.split(':'); diff --git a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/helpers/templates/buildArgumentsForTemplate.js b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/helpers/templates/buildArgumentsForTemplate.js index 12183c88b1..acf899c931 100644 --- a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/helpers/templates/buildArgumentsForTemplate.js +++ b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/helpers/templates/buildArgumentsForTemplate.js @@ -7,6 +7,7 @@ import { } from '../TEIFilters/clientConfigToApiTEIFilterQueryConverter'; import type { TeiWorkingListsColumnConfigs, ApiTrackerQueryCriteria } from '../../types'; import type { FiltersData } from '../../../WorkingListsBase'; +import { getOrderQueryArgs } from '../../epics'; export const buildArgumentsForTemplate = ({ filters, @@ -59,7 +60,7 @@ export const buildArgumentsForTemplate = ({ scheduledAt, attributeValueFilters, dataFilters, - order: `${sortById}:${sortByDirection}`, + order: getOrderQueryArgs(sortById, sortByDirection), displayColumnOrder: visibleColumnIds, programStage: programStageId, }; From 9f50a125e2167f997634469e23f2290e7fb0111b Mon Sep 17 00:00:00 2001 From: Simona Domnisoru Date: Mon, 29 Jul 2024 16:22:27 +0200 Subject: [PATCH 3/4] fix: bad request when sorting in the working lists --- .../helpers/getEventListData/getEventListData.js | 2 +- .../helpers/getListDataCommon/getOrderQueryArgs.js | 10 +++++++++- .../helpers/getTeiListData/getTeiListData.js | 2 +- .../helpers/templates/buildArgumentsForTemplate.js | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getEventListData/getEventListData.js b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getEventListData/getEventListData.js index 50e1b147d9..01c988e5e1 100644 --- a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getEventListData/getEventListData.js +++ b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getEventListData/getEventListData.js @@ -35,7 +35,7 @@ const createApiEventQueryArgs = ( ...getApiFilterQueryArgs(rawSplitFilters.filters, filtersOnlyMetaForDataFetching), ...getApiFilterAttributesQueryArgs(rawSplitFilters.filterAttributes, filtersOnlyMetaForDataFetching), ...getMainApiFilterQueryArgs(filters, filtersOnlyMetaForDataFetching), - order: getOrderQueryArgs(sortById, sortByDirection, true), + order: getOrderQueryArgs({ sortById, sortByDirection, withAPINameConverter: true }), page, pageSize, orgUnit, diff --git a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getListDataCommon/getOrderQueryArgs.js b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getListDataCommon/getOrderQueryArgs.js index 1ea3080168..231a39b897 100644 --- a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getListDataCommon/getOrderQueryArgs.js +++ b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getListDataCommon/getOrderQueryArgs.js @@ -6,7 +6,15 @@ export const DEFAULT_SORT = { sortByDirection: 'desc', }; -export const getOrderQueryArgs = (sortById: string, sortByDirection: string, withAPINameConverter?: boolean) => { +export const getOrderQueryArgs = ({ + sortById, + sortByDirection, + withAPINameConverter, +}: { + sortById: string, + sortByDirection: string, + withAPINameConverter?: boolean, +}) => { const orderId = withAPINameConverter ? getFilterApiName(sortById) : sortById; if (sortByDirection === 'default') { diff --git a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getTeiListData/getTeiListData.js b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getTeiListData/getTeiListData.js index 901839a30f..11b5428454 100644 --- a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getTeiListData/getTeiListData.js +++ b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getTeiListData/getTeiListData.js @@ -25,7 +25,7 @@ filtersOnlyMetaForDataFetching: TeiFiltersOnlyMetaForDataFetching, ): { [string]: any } => ({ ...getApiFilterQueryArgs(filters, filtersOnlyMetaForDataFetching), ...getMainApiFilterQueryArgs(filters, filtersOnlyMetaForDataFetching), - order: getOrderQueryArgs(sortById, sortByDirection, true), + order: getOrderQueryArgs({ sortById, sortByDirection, withAPINameConverter: true }), page, pageSize, orgUnit, diff --git a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/helpers/templates/buildArgumentsForTemplate.js b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/helpers/templates/buildArgumentsForTemplate.js index acf899c931..9d16721c2e 100644 --- a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/helpers/templates/buildArgumentsForTemplate.js +++ b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/helpers/templates/buildArgumentsForTemplate.js @@ -60,7 +60,7 @@ export const buildArgumentsForTemplate = ({ scheduledAt, attributeValueFilters, dataFilters, - order: getOrderQueryArgs(sortById, sortByDirection), + order: getOrderQueryArgs({ sortById, sortByDirection }), displayColumnOrder: visibleColumnIds, programStage: programStageId, }; From d7795b458831974b196c302c6b0244afbbf40510 Mon Sep 17 00:00:00 2001 From: Simona Domnisoru Date: Mon, 29 Jul 2024 16:26:14 +0200 Subject: [PATCH 4/4] fix: bad request when sorting in the working lists --- .../helpers/getListDataCommon/getOrderQueryArgs.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getListDataCommon/getOrderQueryArgs.js b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getListDataCommon/getOrderQueryArgs.js index 231a39b897..a104e93071 100644 --- a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getListDataCommon/getOrderQueryArgs.js +++ b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getListDataCommon/getOrderQueryArgs.js @@ -15,10 +15,10 @@ export const getOrderQueryArgs = ({ sortByDirection: string, withAPINameConverter?: boolean, }) => { - const orderId = withAPINameConverter ? getFilterApiName(sortById) : sortById; - if (sortByDirection === 'default') { return `${DEFAULT_SORT.sortById}:${DEFAULT_SORT.sortByDirection}`; } + + const orderId = withAPINameConverter ? getFilterApiName(sortById) : sortById; return `${orderId}:${sortByDirection}`; };