From 57a7b8300c841d043da84735ed32dfce0b64e25b Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Sun, 27 Oct 2024 02:44:49 +0100 Subject: [PATCH 01/14] fix(translations): sync translations from transifex (master) Automatically merged. --- i18n/cs.po | 22 ++++++++-------- i18n/es.po | 25 ++++++++++-------- i18n/es_419.po | 70 ++++++++++---------------------------------------- i18n/fr.po | 23 ++++++++++------- i18n/id.po | 24 +++++++++-------- i18n/lo.po | 26 ++++++++++--------- i18n/nb.po | 26 ++++++++++--------- i18n/nl.po | 24 +++++++++-------- i18n/zh.po | 60 ++++++++++--------------------------------- 9 files changed, 122 insertions(+), 178 deletions(-) diff --git a/i18n/cs.po b/i18n/cs.po index a280598f67..496af4cba9 100644 --- a/i18n/cs.po +++ b/i18n/cs.po @@ -719,9 +719,6 @@ msgstr "Zobrazit pracovní seznam v tomto programu." msgid "Page is missing required values from URL" msgstr "Na stránce chybí požadované hodnoty z adresy URL" -msgid "Program is not valid" -msgstr "Program není platný" - msgid "Org unit is not valid with current program" msgstr "Organizační jednotka není platná pro aktuální program" @@ -1238,6 +1235,12 @@ msgstr "Widget pro zápis nelze načíst. Prosím zkuste to znovu později" msgid "Follow-up" msgstr "Následovat" +msgid "Started at{{escape}}" +msgstr "" + +msgid "Owned by{{escape}}" +msgstr "" + msgid "Cancelled" msgstr "Zrušeno" @@ -1442,13 +1445,6 @@ msgstr "{{ linkableStageLabel }} nemá žádné propojitelné události" msgid "Ambiguous relationships, contact system administrator" msgstr "Nejednoznačné vztahy, kontaktujte správce systému" -msgid "" -"Enter {{linkableStageLabel}} details in the next step after completing this " -"{{currentStageLabel}}." -msgstr "" -"V dalším kroku po vyplnění této stránky {{currentStageLabel}} zadejte údaje " -"{{linkableStageLabel}}." - msgid "Enter details now" msgstr "Zadejte nyní podrobnosti" @@ -1533,6 +1529,9 @@ msgstr "Seznam změn" msgid "No changes to display" msgstr "" +msgid "Updated" +msgstr "Aktualizováno" + msgid "Created" msgstr "Vytvořeno" @@ -1551,6 +1550,9 @@ msgstr "Datová položka" msgid "Change" msgstr "" +msgid "Value" +msgstr "" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" diff --git a/i18n/es.po b/i18n/es.po index bfd046a3bf..62ee25e726 100644 --- a/i18n/es.po +++ b/i18n/es.po @@ -14,13 +14,14 @@ # Viktor Varland , 2024 # Marta Vila , 2024 # Juan M Alcantara Acosta , 2024 +# Manuel Silva , 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" "POT-Creation-Date: 2024-10-14T14:53:34.553Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" -"Last-Translator: Juan M Alcantara Acosta , 2024\n" +"Last-Translator: Manuel Silva , 2024\n" "Language-Team: Spanish (https://app.transifex.com/hisp-uio/teams/100509/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -743,9 +744,6 @@ msgstr "Ver lista de trabajo en este programa." msgid "Page is missing required values from URL" msgstr "A la página le faltan los valores obligatorios de la URL" -msgid "Program is not valid" -msgstr "El programa no es válido" - msgid "Org unit is not valid with current program" msgstr "La unidad organizativa no es válida con el programa actual" @@ -1276,6 +1274,12 @@ msgstr "" msgid "Follow-up" msgstr "Seguimiento" +msgid "Started at{{escape}}" +msgstr "" + +msgid "Owned by{{escape}}" +msgstr "" + msgid "Cancelled" msgstr "Cancelar" @@ -1489,13 +1493,6 @@ 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 "Introducir datos ahora" @@ -1583,6 +1580,9 @@ msgstr "Registro de cambios" msgid "No changes to display" msgstr "No hay cambios para mostrar" +msgid "Updated" +msgstr "Actualizado" + msgid "Created" msgstr "Creado" @@ -1601,6 +1601,9 @@ msgstr "Elemento de datos" msgid "Change" msgstr "Cambio" +msgid "Value" +msgstr "" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "Nueva relación de {{trackedEntityTypeName}}" diff --git a/i18n/es_419.po b/i18n/es_419.po index f5afa49b7d..c94ef95e6a 100644 --- a/i18n/es_419.po +++ b/i18n/es_419.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-09-02T11:08:16.281Z\n" +"POT-Creation-Date: 2024-10-14T14:53:34.553Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Jaime Bosque , 2024\n" "Language-Team: Spanish (Latin America) (https://app.transifex.com/hisp-uio/teams/100509/es_419/)\n" @@ -635,54 +635,6 @@ msgstr "Aviso" msgid "Close the notice" msgstr "cerrar el aviso" -msgid "Use new Enrollment dashboard for {{programName}}" -msgstr "Usar el nuevo panel de inscripción para {{programName}}" - -msgid "Opt in for {{programName}}" -msgstr "Opt in para el programa {{programName}}" - -msgid "" -"By clicking opt-in below, you will start using the new enrollment dashboard " -"in the Capture app for this Tracker program. At the moment, there is certain" -" functionality from Tracker Capture that has not yet been added, including " -"relationship and referral functionality. The work on including this Tracker " -"functionality in Capture is ongoing and will be added in upcoming app " -"releases." -msgstr "" -"Al hacer clic en registrarse, comenzará a utilizar el nuevo panel de " -"inscripción en Capture para este programa. Por el momento, hay ciertas " -"funciones de la Tracker Capture que aún no se han agregado, incluida la " -"función de relación y referencia. El trabajo para incluir esta funcionalidad" -" Tracker en Capture está en curso y se agregará en próximos lanzamientos de " -"la aplicación." - -msgid "" -"The core team appreciates any feedback on this new functionality which is " -"currently being beta tested, please report any issues and feedback in the " -"DHIS2 JIRA project." -msgstr "" -"El equipo de desarrollo agradece cualquier comentario sobre esta nueva " -"funcionalidad que actualmente se está probando en versión beta. Informe " -"cualquier problema y comentario en el proyecto de JIRA de DHIS2." - -msgid "" -"Click the button below to opt-in to the new enrollment dashboard " -"functionality in the Capture app (beta) for this Tracker program for all " -"users." -msgstr "" -"Haga clic en el botón de abajo para optar por la nueva funcionalidad del " -"panel de inscripción en la aplicación Capture (beta) para este programa " -"Tracker para todos los usuarios." - -msgid "Yes, opt in" -msgstr "Sí, opt in" - -msgid "Stop using new Enrollment dashboard for {{programName}}" -msgstr "Deje de usar el nuevo panel de inscripción para {{programName}}" - -msgid "Opt out for {{programName}}" -msgstr "Dejar de probar la nueva app con el programa \"{{programName}}\"" - msgid "Enrollment with id \"{{enrollmentId}}\" does not exist" msgstr "La inscripción con id \"{{enrollmentId}}\" no existe" @@ -780,9 +732,6 @@ msgstr "Ver lista de trabajo en este programa." msgid "Page is missing required values from URL" msgstr "A la página le faltan los valores obligatorios de la URL" -msgid "Program is not valid" -msgstr "El programa no es válido" - msgid "Org unit is not valid with current program" msgstr "La unidad organizativa no es válida con el programa actual" @@ -1284,6 +1233,12 @@ msgstr "" msgid "Follow-up" msgstr "" +msgid "Started at{{escape}}" +msgstr "" + +msgid "Owned by{{escape}}" +msgstr "" + msgid "Cancelled" msgstr "Cancelar" @@ -1474,11 +1429,6 @@ 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 "" @@ -1562,6 +1512,9 @@ msgstr "" msgid "No changes to display" msgstr "" +msgid "Updated" +msgstr "" + msgid "Created" msgstr "" @@ -1580,6 +1533,9 @@ msgstr "" msgid "Change" msgstr "" +msgid "Value" +msgstr "" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" diff --git a/i18n/fr.po b/i18n/fr.po index 277a314448..3effbc2fc8 100644 --- a/i18n/fr.po +++ b/i18n/fr.po @@ -10,13 +10,14 @@ # Viktor Varland , 2024 # Yayra Gomado , 2024 # Bram Piot , 2024 +# Jason Pickering , 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" "POT-Creation-Date: 2024-10-14T14:53:34.553Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" -"Last-Translator: Bram Piot , 2024\n" +"Last-Translator: Jason Pickering , 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" @@ -739,9 +740,6 @@ msgstr "Afficher la liste de travail dans ce programme." msgid "Page is missing required values from URL" msgstr "Des valeurs obligatoires ne figurent pas dans l'URL de la page" -msgid "Program is not valid" -msgstr "Le programme n'est pas valide" - msgid "Org unit is not valid with current program" msgstr "L'unité d'organisation n'est pas valide avec le programme actuel" @@ -1256,6 +1254,12 @@ msgstr "" msgid "Follow-up" msgstr "Suivi" +msgid "Started at{{escape}}" +msgstr "" + +msgid "Owned by{{escape}}" +msgstr "" + msgid "Cancelled" msgstr "Annulé" @@ -1465,11 +1469,6 @@ 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 "Saisir les détails maintenant" @@ -1554,6 +1553,9 @@ msgstr "" msgid "No changes to display" msgstr "" +msgid "Updated" +msgstr "Mis-à-jour" + msgid "Created" msgstr "Créé" @@ -1572,6 +1574,9 @@ msgstr "Item de données" msgid "Change" msgstr "Modifier" +msgid "Value" +msgstr "" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" diff --git a/i18n/id.po b/i18n/id.po index c4fca90018..1cf72fa6a2 100644 --- a/i18n/id.po +++ b/i18n/id.po @@ -8,15 +8,15 @@ # ratih syabrina, 2024 # Yusuf Setiawan , 2024 # Guardian Sanjaya , 2024 -# Viktor Varland , 2024 # Aprisa Chrysantina , 2024 +# Viktor Varland , 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" "POT-Creation-Date: 2024-10-14T14:53:34.553Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" -"Last-Translator: Aprisa Chrysantina , 2024\n" +"Last-Translator: Viktor Varland , 2024\n" "Language-Team: Indonesian (https://app.transifex.com/hisp-uio/teams/100509/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -722,9 +722,6 @@ msgstr "Lihat daftar kerja dalam program ini." msgid "Page is missing required values from URL" msgstr "Halaman kehilangan nilai yang diutuhkan dari URL" -msgid "Program is not valid" -msgstr "Program tidak valid" - msgid "Org unit is not valid with current program" msgstr "" @@ -1227,6 +1224,12 @@ msgstr "Widget pendaftaran tidak dapat dimuat. Silakan coba lagi nanti" msgid "Follow-up" msgstr "Mengikuti" +msgid "Started at{{escape}}" +msgstr "" + +msgid "Owned by{{escape}}" +msgstr "" + msgid "Cancelled" msgstr "Dibatalkan" @@ -1413,11 +1416,6 @@ 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 "" @@ -1499,6 +1497,9 @@ msgstr "" msgid "No changes to display" msgstr "" +msgid "Updated" +msgstr "Diperbarui" + msgid "Created" msgstr "Dibuat" @@ -1517,6 +1518,9 @@ msgstr "Data item" msgid "Change" msgstr "" +msgid "Value" +msgstr "Nilai" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" diff --git a/i18n/lo.po b/i18n/lo.po index 2f880d5d1f..4decb60044 100644 --- a/i18n/lo.po +++ b/i18n/lo.po @@ -1,18 +1,18 @@ # # Translators: # Philip Larsen Donnelly, 2022 -# Saysamone Sibounma, 2023 # Somkhit Bouavong , 2024 # Thuy Nguyen , 2024 # Viktor Varland , 2024 # Namwan Chanthavisouk, 2024 +# Saysamone Sibounma, 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" "POT-Creation-Date: 2024-10-14T14:53:34.553Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" -"Last-Translator: Namwan Chanthavisouk, 2024\n" +"Last-Translator: Saysamone Sibounma, 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" @@ -713,9 +713,6 @@ msgstr "ເບິ່ງລາຍຊື່ເຮັດວຽກຢູ່ໃນໂ msgid "Page is missing required values from URL" msgstr "ບໍ່ພົບໜ້ານີ້ ຕ້ອງການຄ່າຈາກ URL" -msgid "Program is not valid" -msgstr "ໂປຣແກຼມບໍ່ຖືກຕ້ອງ" - msgid "Org unit is not valid with current program" msgstr "ຫົວໜ່ວຍການຈັດຕັ້ງບໍ່ຖືກຕ້ອງກັບໂປແກຼມນີ້" @@ -1221,6 +1218,12 @@ msgstr "ບໍ່ສາມາດໂຫຼດລາຍການການລົງ msgid "Follow-up" msgstr "ຕິດຕາມ" +msgid "Started at{{escape}}" +msgstr "" + +msgid "Owned by{{escape}}" +msgstr "" + msgid "Cancelled" msgstr "ຍົກເລີກແລ້ວ" @@ -1414,13 +1417,6 @@ msgstr "{{ linkableStageLabel }} ບໍ່ມີເຫດການທີ່ສ msgid "Ambiguous relationships, contact system administrator" msgstr "ການເຊື່ອມໂຍງບໍ່ຊັດເຈນ, ຕິດຕໍ່ຜູ້ດູແລລະບົບ" -msgid "" -"Enter {{linkableStageLabel}} details in the next step after completing this " -"{{currentStageLabel}}." -msgstr "" -"ໃສ່ລາຍລະອຽດ {{linkableStageLabel}} ໃນຂັ້ນຕອນຕໍ່ໄປຫຼັງຈາກເຮັດສໍາເລັດ " -"{{currentStageLabel}} ນີ້." - msgid "Enter details now" msgstr "ປ້ອນລາຍລະອຽດ" @@ -1504,6 +1500,9 @@ msgstr "ບັນທຶກການປ່ຽນແປງ" msgid "No changes to display" msgstr "ບໍ່ມີການປ່ຽນແປງທີ່ຈະສະແດງ" +msgid "Updated" +msgstr "" + msgid "Created" msgstr "ສ້າງແລ້ວ" @@ -1522,6 +1521,9 @@ msgstr "ລາຍການຂໍ້ມູນ" msgid "Change" msgstr "ປ່ຽນ" +msgid "Value" +msgstr "ຄ່າ" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "ຄວາມສໍາພັນໃໝ່ {{trackedEntityTypeName}} " diff --git a/i18n/nb.po b/i18n/nb.po index 6ec77b1236..6b566e538a 100644 --- a/i18n/nb.po +++ b/i18n/nb.po @@ -1,15 +1,15 @@ # # Translators: # Karoline Tufte Lien , 2024 -# Caroline Hesthagen Holen , 2024 # Merethe Wollan Blisten, 2024 +# Caroline Hesthagen Holen , 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" "POT-Creation-Date: 2024-10-14T14:53:34.553Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" -"Last-Translator: Merethe Wollan Blisten, 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" @@ -721,9 +721,6 @@ msgstr "Se arbeidsliste i dette programmet." msgid "Page is missing required values from URL" msgstr "Siden mangler nødvendige verdier fra URL" -msgid "Program is not valid" -msgstr "Programmet er ikke gyldig" - msgid "Org unit is not valid with current program" msgstr "Organisasjonsenheten er ikke gyldig med gjeldende program" @@ -1242,6 +1239,12 @@ msgstr "Registreringsmodulen kunne ikke lastes inn. Prøv igjen senere" msgid "Follow-up" msgstr "Oppfølging" +msgid "Started at{{escape}}" +msgstr "" + +msgid "Owned by{{escape}}" +msgstr "" + msgid "Cancelled" msgstr "Kansellert" @@ -1444,13 +1447,6 @@ msgstr "{{ linkableStageLabel }} har ingen hendelser som kan kobles til" msgid "Ambiguous relationships, contact system administrator" msgstr "Uklare relasjoner, kontakt din systemadministrator" -msgid "" -"Enter {{linkableStageLabel}} details in the next step after completing this " -"{{currentStageLabel}}." -msgstr "" -"Skriv inn {{linkableStageLabel}}detaljer i neste trinn etter du har fullført" -" dette {{currentStageLabel}}." - msgid "Enter details now" msgstr "Skriv inn detaljer " @@ -1536,6 +1532,9 @@ msgstr "Endringslogg" msgid "No changes to display" msgstr "Ingen endringer å vise" +msgid "Updated" +msgstr "Oppdatert" + msgid "Created" msgstr "Opprettet" @@ -1554,6 +1553,9 @@ msgstr "Datapunkt" msgid "Change" msgstr "Endre" +msgid "Value" +msgstr "Verdi" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "Ny {{trackedEntityTypeName}} relasjon" diff --git a/i18n/nl.po b/i18n/nl.po index 62c2f2c8f9..9f88c8b400 100644 --- a/i18n/nl.po +++ b/i18n/nl.po @@ -3,15 +3,15 @@ # Cherise Beek , 2021 # Yury Rogachev , 2021 # Philip Larsen Donnelly, 2024 -# Rica, 2024 # Charel van den Elsen, 2024 +# Rica, 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" "POT-Creation-Date: 2024-10-14T14:53:34.553Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" -"Last-Translator: Charel van den Elsen, 2024\n" +"Last-Translator: Rica, 2024\n" "Language-Team: Dutch (https://app.transifex.com/hisp-uio/teams/100509/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -730,9 +730,6 @@ msgstr "Bekijk werklijst in dit programma." msgid "Page is missing required values from URL" msgstr "Pagina mist vereiste waarden van URL" -msgid "Program is not valid" -msgstr "Programma is niet geldig" - msgid "Org unit is not valid with current program" msgstr "Organisatie-eenheid is niet geldig met het huidige programma" @@ -1250,6 +1247,12 @@ msgstr "" msgid "Follow-up" msgstr "Opvolgen" +msgid "Started at{{escape}}" +msgstr "" + +msgid "Owned by{{escape}}" +msgstr "" + msgid "Cancelled" msgstr "Geannuleerd" @@ -1453,11 +1456,6 @@ 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 "" @@ -1541,6 +1539,9 @@ msgstr "" msgid "No changes to display" msgstr "" +msgid "Updated" +msgstr "" + msgid "Created" msgstr "Gemaakt" @@ -1559,6 +1560,9 @@ msgstr "Gegevensitem" msgid "Change" msgstr "" +msgid "Value" +msgstr "Waarde" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" diff --git a/i18n/zh.po b/i18n/zh.po index dcd850bd86..d18eb1bd0d 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-09-02T11:08:16.281Z\n" +"POT-Creation-Date: 2024-10-14T14:53:34.553Z\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" @@ -610,44 +610,6 @@ msgstr "注意" msgid "Close the notice" msgstr "关闭通知" -msgid "Use new Enrollment dashboard for {{programName}}" -msgstr "为 {{programName}} 使用新的注册仪表板" - -msgid "Opt in for {{programName}}" -msgstr "选择加入 {{programName}}" - -msgid "" -"By clicking opt-in below, you will start using the new enrollment dashboard " -"in the Capture app for this Tracker program. At the moment, there is certain" -" functionality from Tracker Capture that has not yet been added, including " -"relationship and referral functionality. The work on including this Tracker " -"functionality in Capture is ongoing and will be added in upcoming app " -"releases." -msgstr "" -"通过单击下面的选择加入，您将开始使用 Capture 应用程序中的新注册仪表板来执行此跟踪项目。目前，Tracker Capture " -"的某些功能尚未添加，包括关系和推荐功能。在 Capture 中包含此 Tracker 功能的工作正在进行中，并将添加到即将发布的应用程序中。" - -msgid "" -"The core team appreciates any feedback on this new functionality which is " -"currently being beta tested, please report any issues and feedback in the " -"DHIS2 JIRA project." -msgstr "核心团队感谢对目前正在 Beta 测试的这个新功能的任何反馈，请报告 DHIS2 JIRA 项目中的任何问题和反馈。" - -msgid "" -"Click the button below to opt-in to the new enrollment dashboard " -"functionality in the Capture app (beta) for this Tracker program for all " -"users." -msgstr "单击下面的按钮，为所有用户选择加入此 Tracker 程序的 Capture 应用程序（测试版）中的新注册仪表板功能。" - -msgid "Yes, opt in" -msgstr "是的，选择加入" - -msgid "Stop using new Enrollment dashboard for {{programName}}" -msgstr "停止为 {{programName}} 使用新的注册信息中心" - -msgid "Opt out for {{programName}}" -msgstr "选择退出 {{programName}}" - msgid "Enrollment with id \"{{enrollmentId}}\" does not exist" msgstr "ID为“ {{enrollmentId}}”的报名不存在" @@ -736,9 +698,6 @@ msgstr "查看此项目中的工作清单。" msgid "Page is missing required values from URL" msgstr "页面缺少 URL 中的必需值" -msgid "Program is not valid" -msgstr "项目无效" - msgid "Org unit is not valid with current program" msgstr "机构对当前项目无效" @@ -1232,6 +1191,12 @@ msgstr "无法加载报名的小部件。请稍后再试" msgid "Follow-up" msgstr "后续" +msgid "Started at{{escape}}" +msgstr "" + +msgid "Owned by{{escape}}" +msgstr "" + msgid "Cancelled" msgstr "已取消" @@ -1420,11 +1385,6 @@ msgstr "{{ linkableStageLabel }} 没有可链接的事件" msgid "Ambiguous relationships, contact system administrator" msgstr "关系不明确，请联系系统管理员" -msgid "" -"Enter {{linkableStageLabel}} details in the next step after completing this " -"{{currentStageLabel}}." -msgstr "完成此{{currentStageLabel}}后，在下一步中输入{{linkableStageLabel}}详细信息。" - msgid "Enter details now" msgstr "立即输入详细信息" @@ -1506,6 +1466,9 @@ msgstr "变更日志" msgid "No changes to display" msgstr "没有显示任何变化" +msgid "Updated" +msgstr "更新" + msgid "Created" msgstr "已创建" @@ -1524,6 +1487,9 @@ msgstr "数据条目" msgid "Change" msgstr "改变" +msgid "Value" +msgstr "价值" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "新的 {{trackedEntityTypeName}} 关系" From d6b89ee0af39781e32258792ef877833a10ca039 Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Sun, 27 Oct 2024 01:49:17 +0000 Subject: [PATCH 02/14] chore(release): cut 101.14.2 [skip release] ## [101.14.2](https://github.com/dhis2/capture-app/compare/v101.14.1...v101.14.2) (2024-10-27) ### Bug Fixes * **translations:** sync translations from transifex (master) ([57a7b83](https://github.com/dhis2/capture-app/commit/57a7b8300c841d043da84735ed32dfce0b64e25b)) --- CHANGELOG.md | 7 +++++++ package.json | 4 ++-- packages/rules-engine/package.json | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e004597d9..83d7a95cd7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [101.14.2](https://github.com/dhis2/capture-app/compare/v101.14.1...v101.14.2) (2024-10-27) + + +### Bug Fixes + +* **translations:** sync translations from transifex (master) ([57a7b83](https://github.com/dhis2/capture-app/commit/57a7b8300c841d043da84735ed32dfce0b64e25b)) + ## [101.14.1](https://github.com/dhis2/capture-app/compare/v101.14.0...v101.14.1) (2024-10-22) diff --git a/package.json b/package.json index 2fce1e4512..3ecab1f6b5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "capture-app", "homepage": ".", - "version": "101.14.1", + "version": "101.14.2", "cacheVersion": "7", "serverVersion": "38", "license": "BSD-3-Clause", @@ -10,7 +10,7 @@ "packages/rules-engine" ], "dependencies": { - "@dhis2/rules-engine-javascript": "101.14.1", + "@dhis2/rules-engine-javascript": "101.14.2", "@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 757d7f3547..841958de6d 100644 --- a/packages/rules-engine/package.json +++ b/packages/rules-engine/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/rules-engine-javascript", - "version": "101.14.1", + "version": "101.14.2", "license": "BSD-3-Clause", "main": "./build/cjs/index.js", "scripts": { From 806caa92a3124ce6ef5b735abe1e6a6762a96f12 Mon Sep 17 00:00:00 2001 From: Rene Pot Date: Mon, 28 Oct 2024 03:14:08 -0700 Subject: [PATCH 03/14] docs: improve docs (#3865) --- docs/developer/configure-a-capture-plugin.mdx | 5 +-- docs/developer/develop-a-capture-plugin.md | 6 +-- .../enrollment-plugins/manual-setup.mdx | 40 +++++++------------ .../form-field-plugins/developer-details.md | 6 +-- docs/developer/getting-started.md | 4 ++ 5 files changed, 26 insertions(+), 35 deletions(-) diff --git a/docs/developer/configure-a-capture-plugin.mdx b/docs/developer/configure-a-capture-plugin.mdx index dbf597972a..7f7ab36e39 100644 --- a/docs/developer/configure-a-capture-plugin.mdx +++ b/docs/developer/configure-a-capture-plugin.mdx @@ -1,5 +1,4 @@ import Logo from './resources/tracker-plugin-configurator-logo.png' -import TPCFormFieldDemoImg from './resources/tpc-form-field-demo.png' # Configuration @@ -11,7 +10,7 @@ This application is called __Tracker Plugin Configurator__ and is available in t The app is also installable from the App Management app in your DHIS2 instance. -Tracker Plugin Configurator +Tracker Plugin Configurator ### How to use the Tracker Plugin Configurator @@ -25,5 +24,5 @@ The app is also installable from the App Management app in your DHIS2 instance.
-Form Field Plugin +![Form field plugin](resources/tpc-form-field-demo.png) diff --git a/docs/developer/develop-a-capture-plugin.md b/docs/developer/develop-a-capture-plugin.md index 1205c186b5..6f109ce37f 100644 --- a/docs/developer/develop-a-capture-plugin.md +++ b/docs/developer/develop-a-capture-plugin.md @@ -5,7 +5,7 @@ description: Learn how to develop a plugin for the DHIS2 Capture app. id: develop-a-capture-plugin --- -To develop your own capture plugin, you need to follow these steps: +Developing a capture plugin is almost the same as developing a regular DHIS2 custom app. However, there are some differences in how you structure your plugin and how you configure it to work with the DHIS2 Capture app. These are outlined in the few steps below. ## Step 1: Create a new DHIS2 custom app @@ -52,6 +52,6 @@ To build your plugin, you can use the provided build script from `d2-app-scripts Run `yarn build` or (`d2-app-scripts build`) to build a production version of your plugin. After building your plugin, you can deploy it to your DHIS2 instance. -You can do this by uploading the ZIP file to the _App management_ app in your DHIS2 instance, or publishing it to the app hub. +You can do this by uploading the ZIP file to the _App management_ app in your DHIS2 instance, or publishing it to the App Hub. -See [Configuring a Capture plugin](/docs/capture-plugins/developer/configure-a-capture-plugin) for more information on how to configure your plugin in the DHIS2 Capture app. +See [Configuring a Capture plugin](configure-a-capture-plugin) for more information on how to configure your plugin in the DHIS2 Capture app. diff --git a/docs/developer/enrollment-plugins/manual-setup.mdx b/docs/developer/enrollment-plugins/manual-setup.mdx index bae6afbe0f..36c4443d5a 100644 --- a/docs/developer/enrollment-plugins/manual-setup.mdx +++ b/docs/developer/enrollment-plugins/manual-setup.mdx @@ -19,7 +19,7 @@ When booting the capture application, we will look in the dataStore for these ke We assume that you will already have these three keys under the `capture` namespace in the datastore. If you do not have them, please create them before proceeding. | Page | Key | -|-----------------------|-----------------------------| +| --------------------- | --------------------------- | | Enrollment Dashboard | `enrollmentOverviewLayout` | | Enrollment Add Event | `enrollmentEventNewLayout` | | Enrollment Edit Event | `enrollmentEventEditLayout` | @@ -37,10 +37,8 @@ You can also have different layouts for the three different enrollment pages. label={'Enrollment Dashboard'} default > - - {`{ +```json +{ "IpHINAT79UW": { "title": "Child Programme dashboard", "leftColumn": [ @@ -94,17 +92,15 @@ You can also have different layouts for the three different enrollment pages. } ] } -}`} - +} +``` - - {`{ +```json +{ "IpHINAT79UW": { "title": "Child Programme: Add Event", "leftColumn": [ @@ -150,17 +146,15 @@ You can also have different layouts for the three different enrollment pages. } ] } -}`} - +} +``` - - {`{ +```json +{ "IpHINAT79UW": { "title": "Child Programme: Edit Event", "leftColumn": [ @@ -215,7 +209,7 @@ You can also have different layouts for the three different enrollment pages. ] } }`} - +``` @@ -268,11 +262,8 @@ You can also extend the configurations to render your own custom plugins. You ca You would place this inside either the `leftColumn` or `rightColumn` array. - -{`"leftColumn": [ +```json title="capture/enrollmentEventEditLayout" +"leftColumn": [ { "type": "component", "name": "EditEventWorkspace" @@ -284,6 +275,5 @@ You would place this inside either the `leftColumn` or `rightColumn` array. } // highlight-end ], -`} - +``` diff --git a/docs/developer/form-field-plugins/developer-details.md b/docs/developer/form-field-plugins/developer-details.md index 86b30531d9..cce32947ce 100644 --- a/docs/developer/form-field-plugins/developer-details.md +++ b/docs/developer/form-field-plugins/developer-details.md @@ -4,11 +4,9 @@ sidebar_label: Developer details id: developer-details --- -Here are some details for developers who want to develop a form field plugin for the DHIS2 Capture app. - A form field plugin runs in a sandboxed environment, meaning it can only read and write data that it's been configured to have access to. -If the plugin is given access to a field, we provide any relevant values, metadata, and rules engine output for that field. -We also provide some context about the application state, mainly if the plugin is in view or edit mode, or if the form has been attempted submitted. +If the plugin is given access to a field, all relevant values, metadata, and rules engine output for that field is provided. +Also the context about the application state is provided, mainly if the plugin is in view or edit mode, or if the form has been attempted to be submitted. If a plugin tries to update a field that it has not been given access to, an appropriate error message will be displayed in the console. diff --git a/docs/developer/getting-started.md b/docs/developer/getting-started.md index 6fcd7ead9f..e25b294434 100644 --- a/docs/developer/getting-started.md +++ b/docs/developer/getting-started.md @@ -6,6 +6,10 @@ The plugin framework is currently an experimental feature and is subject to chan We are working on improving both the technology and the way you use it. We will provide more documentation and examples as we progress. ::: +:::info Supported versions +The plugin framework is supported in **DHIS2 version 40.5 and later**. +::: + ## What are plugins? Plugins are a way to extend the functionality of our core applications within the DHIS2 ecosystem. These plugins will act and feel like native widgets / components, and allow you to write custom code that will be injected into the core applications, From edee6d350fb2672a3470ef4c282460b34fa726eb Mon Sep 17 00:00:00 2001 From: henrikmv <110386561+henrikmv@users.noreply.github.com> Date: Tue, 29 Oct 2024 13:35:29 +0100 Subject: [PATCH 04/14] fix: [DHIS2-17843] Disable delete enrollment button when user does not have authority (#3859) * fix: string adjustment * fix: disable button and add tooltip * fix: revert wrong commit * fix: create generic authorities hook --- i18n/en.pot | 7 +++-- .../Actions/Actions.component.js | 2 ++ .../Actions/Actions.container.js | 3 +++ .../Actions/Delete/Delete.component.js | 12 ++++++--- .../Actions/Delete/delete.types.js | 1 + .../WidgetEnrollment/Actions/actions.types.js | 1 + .../WidgetEventEdit.container.js | 6 ++--- .../components/WidgetEventEdit/hooks/index.js | 2 -- .../OverflowMenu/OverflowMenu.container.js | 6 ++--- .../WidgetProfile/OverflowMenu/hooks/index.js | 2 -- .../OverflowMenu/hooks/useAuthorities.js | 27 ------------------- .../authority}/useAuthorities.js | 13 ++++----- 12 files changed, 33 insertions(+), 49 deletions(-) delete mode 100644 src/core_modules/capture-core/components/WidgetEventEdit/hooks/index.js delete mode 100644 src/core_modules/capture-core/components/WidgetProfile/OverflowMenu/hooks/index.js delete mode 100644 src/core_modules/capture-core/components/WidgetProfile/OverflowMenu/hooks/useAuthorities.js rename src/core_modules/capture-core/{components/WidgetEventEdit/hooks => utils/authority}/useAuthorities.js (54%) diff --git a/i18n/en.pot b/i18n/en.pot index 3bee26bc80..5fb403e3d7 100644 --- a/i18n/en.pot +++ b/i18n/en.pot @@ -5,8 +5,8 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -"POT-Creation-Date: 2024-10-14T14:53:34.553Z\n" -"PO-Revision-Date: 2024-10-14T14:53:34.553Z\n" +"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" +"PO-Revision-Date: 2024-10-25T18:18:11.518Z\n" msgid "Choose one or more dates..." msgstr "Choose one or more dates..." @@ -1133,6 +1133,9 @@ msgstr "Mark as cancelled" msgid "Mark incomplete" msgstr "Mark incomplete" +msgid "You do not have access to delete this enrollment" +msgstr "You do not have access to delete this enrollment" + msgid "Delete enrollment" msgstr "Delete enrollment" diff --git a/src/core_modules/capture-core/components/WidgetEnrollment/Actions/Actions.component.js b/src/core_modules/capture-core/components/WidgetEnrollment/Actions/Actions.component.js index d95f39c8fb..e3e08de57d 100644 --- a/src/core_modules/capture-core/components/WidgetEnrollment/Actions/Actions.component.js +++ b/src/core_modules/capture-core/components/WidgetEnrollment/Actions/Actions.component.js @@ -39,6 +39,7 @@ export const ActionsPlain = ({ onUpdate, onDelete, onUpdateOwnership, + canCascadeDeleteEnrollment, isTransferLoading, onAddNew, loading, @@ -115,6 +116,7 @@ export const ActionsPlain = ({ onUpdate={handleOnUpdateStatus} /> diff --git a/src/core_modules/capture-core/components/WidgetEnrollment/Actions/Actions.container.js b/src/core_modules/capture-core/components/WidgetEnrollment/Actions/Actions.container.js index 79df428da7..b7ad956d52 100644 --- a/src/core_modules/capture-core/components/WidgetEnrollment/Actions/Actions.container.js +++ b/src/core_modules/capture-core/components/WidgetEnrollment/Actions/Actions.container.js @@ -4,6 +4,7 @@ import { ActionsComponent } from './Actions.component'; import type { Props } from './actions.types'; import { useUpdateEnrollment, useDeleteEnrollment } from '../dataMutation/dataMutation'; import { useUpdateOwnership } from './Transfer/hooks'; +import { useAuthorities } from '../../../utils/authority/useAuthorities'; export const Actions = ({ enrollment = {}, @@ -20,6 +21,7 @@ export const Actions = ({ }: Props) => { const { updateMutation, updateLoading } = useUpdateEnrollment(refetchEnrollment, refetchTEI, onError, onSuccess); const { deleteMutation, deleteLoading } = useDeleteEnrollment(onDelete, onError, onSuccess); + const { hasAuthority } = useAuthorities({ authorities: ['F_ENROLLMENT_CASCADE_DELETE'] }); const { updateEnrollmentOwnership, isTransferLoading } = useUpdateOwnership({ teiId: enrollment.trackedEntity, programId: enrollment.program, @@ -52,6 +54,7 @@ export const Actions = ({ onUpdate={updateMutation} onUpdateStatus={handleUpdateStatus} onDelete={deleteMutation} + canCascadeDeleteEnrollment={hasAuthority} loading={updateLoading || deleteLoading || updateStatusLoading} onUpdateOwnership={updateEnrollmentOwnership} isTransferLoading={isTransferLoading} diff --git a/src/core_modules/capture-core/components/WidgetEnrollment/Actions/Delete/Delete.component.js b/src/core_modules/capture-core/components/WidgetEnrollment/Actions/Delete/Delete.component.js index d301326dc7..f870ed9197 100644 --- a/src/core_modules/capture-core/components/WidgetEnrollment/Actions/Delete/Delete.component.js +++ b/src/core_modules/capture-core/components/WidgetEnrollment/Actions/Delete/Delete.component.js @@ -1,4 +1,5 @@ // @flow +import React, { useState } from 'react'; import { IconDelete16, MenuItem, @@ -9,18 +10,21 @@ import { ButtonStrip, Button, } from '@dhis2/ui'; -import React, { useState } from 'react'; import i18n from '@dhis2/d2-i18n'; import type { Props } from './delete.types'; +import { ConditionalTooltip } from '../../../Tooltips/ConditionalTooltip/'; -export const Delete = ({ enrollment, onDelete }: Props) => { +export const Delete = ({ canCascadeDeleteEnrollment, enrollment, onDelete }: Props) => { const [toggle, setToggle] = useState(false); + const disabled = !canCascadeDeleteEnrollment; + const tooltipContent = i18n.t('You do not have access to delete this enrollment'); return ( -
+ } destructive label={i18n.t('Delete')} @@ -54,6 +58,6 @@ export const Delete = ({ enrollment, onDelete }: Props) => { )} -
+ ); }; diff --git a/src/core_modules/capture-core/components/WidgetEnrollment/Actions/Delete/delete.types.js b/src/core_modules/capture-core/components/WidgetEnrollment/Actions/Delete/delete.types.js index 7cd649b391..71b637983f 100644 --- a/src/core_modules/capture-core/components/WidgetEnrollment/Actions/Delete/delete.types.js +++ b/src/core_modules/capture-core/components/WidgetEnrollment/Actions/Delete/delete.types.js @@ -1,6 +1,7 @@ // @flow export type Props = {| + canCascadeDeleteEnrollment: boolean, enrollment: Object, onDelete: (arg: Object) => void, |}; diff --git a/src/core_modules/capture-core/components/WidgetEnrollment/Actions/actions.types.js b/src/core_modules/capture-core/components/WidgetEnrollment/Actions/actions.types.js index e6da45629d..b40adc2282 100644 --- a/src/core_modules/capture-core/components/WidgetEnrollment/Actions/actions.types.js +++ b/src/core_modules/capture-core/components/WidgetEnrollment/Actions/actions.types.js @@ -32,6 +32,7 @@ export type PlainProps = {| onDelete: (arg: Object) => void, onAddNew: (arg: Object) => void, onUpdateOwnership: UpdateEnrollmentOwnership, + canCascadeDeleteEnrollment: boolean, isTransferLoading: boolean, loading: boolean, canAddNew: boolean, diff --git a/src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.js b/src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.js index f953852223..b39bb89c7c 100644 --- a/src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.js +++ b/src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.js @@ -32,7 +32,7 @@ import { EventChangelogWrapper } from './EventChangelogWrapper'; import { FEATURES, useFeature } from '../../../capture-core-utils'; import { inMemoryFileStore } from '../DataEntry/file/inMemoryFileStore'; import { eventStatuses } from './constants/status.const'; -import { useAuthorities } from './hooks'; +import { useAuthorities } from '../../utils/authority/useAuthorities'; const styles = { header: { @@ -101,8 +101,8 @@ export const WidgetEventEditPlain = ({ const loadedValues = useSelector(({ viewEventPage }) => viewEventPage.loadedValues); const eventAccess = getProgramEventAccess(programId, stageId); - const { canEditCompletedEvent } = useAuthorities(); - const blockEntryForm = stage.blockEntryForm && !canEditCompletedEvent && eventStatus === eventStatuses.COMPLETED; + const { hasAuthority } = useAuthorities({ authorities: ['F_UNCOMPLETE_EVENT'] }); + const blockEntryForm = stage.blockEntryForm && !hasAuthority && eventStatus === eventStatuses.COMPLETED; const disableEdit = !eventAccess?.write || blockEntryForm; const tooltipContent = blockEntryForm ? diff --git a/src/core_modules/capture-core/components/WidgetEventEdit/hooks/index.js b/src/core_modules/capture-core/components/WidgetEventEdit/hooks/index.js deleted file mode 100644 index edcfc4f241..0000000000 --- a/src/core_modules/capture-core/components/WidgetEventEdit/hooks/index.js +++ /dev/null @@ -1,2 +0,0 @@ -// @flow -export { useAuthorities } from './useAuthorities'; diff --git a/src/core_modules/capture-core/components/WidgetProfile/OverflowMenu/OverflowMenu.container.js b/src/core_modules/capture-core/components/WidgetProfile/OverflowMenu/OverflowMenu.container.js index f2b4fca631..031f7fd462 100644 --- a/src/core_modules/capture-core/components/WidgetProfile/OverflowMenu/OverflowMenu.container.js +++ b/src/core_modules/capture-core/components/WidgetProfile/OverflowMenu/OverflowMenu.container.js @@ -1,8 +1,8 @@ // @flow import React from 'react'; +import { useAuthorities } from 'capture-core/utils/authority/useAuthorities'; import type { Props } from './OverflowMenu.types'; import { OverflowMenuComponent } from './OverflowMenu.component'; -import { useAuthorities } from './hooks'; export const OverflowMenu = ({ trackedEntityTypeName, @@ -13,13 +13,13 @@ export const OverflowMenu = ({ teiId, programAPI, }: Props) => { - const { canCascadeDeleteTei } = useAuthorities(); + const { hasAuthority } = useAuthorities({ authorities: ['F_TEI_CASCADE_DELETE'] }); return ( { - const queryKey = ['authorities']; - const queryFn = { - resource: 'me.json', - params: { - fields: 'authorities', - }, - }; - const queryOptions = { - select: ({ authorities }) => - authorities && - authorities.some(authority => authority === auth.ALL || authority === auth.F_TEI_CASCADE_DELETE), - }; - const { data } = useApiMetadataQuery(queryKey, queryFn, queryOptions); - - return { - canCascadeDeleteTei: Boolean(data), - }; -}; diff --git a/src/core_modules/capture-core/components/WidgetEventEdit/hooks/useAuthorities.js b/src/core_modules/capture-core/utils/authority/useAuthorities.js similarity index 54% rename from src/core_modules/capture-core/components/WidgetEventEdit/hooks/useAuthorities.js rename to src/core_modules/capture-core/utils/authority/useAuthorities.js index 78de4ab612..0bea301f9e 100644 --- a/src/core_modules/capture-core/components/WidgetEventEdit/hooks/useAuthorities.js +++ b/src/core_modules/capture-core/utils/authority/useAuthorities.js @@ -2,11 +2,10 @@ import { useApiMetadataQuery } from 'capture-core/utils/reactQueryHelpers'; const auth = Object.freeze({ - F_UNCOMPLETE_EVENT: 'F_UNCOMPLETE_EVENT', ALL: 'ALL', }); -export const useAuthorities = () => { +export const useAuthorities = ({ authorities }: { authorities: Array }) => { const queryKey = ['authorities']; const queryFn = { resource: 'me.json', @@ -15,13 +14,15 @@ export const useAuthorities = () => { }, }; const queryOptions = { - select: ({ authorities }) => - authorities && - authorities.some(authority => authority === auth.ALL || authority === auth.F_UNCOMPLETE_EVENT), + select: ({ authorities: userAuthorities }) => + userAuthorities && + authorities.some( + authority => userAuthorities.includes(auth.ALL) || userAuthorities.includes(authority), + ), }; const { data } = useApiMetadataQuery(queryKey, queryFn, queryOptions); return { - canEditCompletedEvent: Boolean(data), + hasAuthority: Boolean(data), }; }; From 52f7822cfd24ccd5ecb0d651ee09dd766fb0c04a Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Tue, 29 Oct 2024 12:48:53 +0000 Subject: [PATCH 05/14] chore(release): cut 101.14.3 [skip release] ## [101.14.3](https://github.com/dhis2/capture-app/compare/v101.14.2...v101.14.3) (2024-10-29) ### Bug Fixes * [DHIS2-17843] Disable delete enrollment button when user does not have authority ([#3859](https://github.com/dhis2/capture-app/issues/3859)) ([edee6d3](https://github.com/dhis2/capture-app/commit/edee6d350fb2672a3470ef4c282460b34fa726eb)) --- CHANGELOG.md | 7 +++++++ package.json | 4 ++-- packages/rules-engine/package.json | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 83d7a95cd7..390cde107f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [101.14.3](https://github.com/dhis2/capture-app/compare/v101.14.2...v101.14.3) (2024-10-29) + + +### Bug Fixes + +* [DHIS2-17843] Disable delete enrollment button when user does not have authority ([#3859](https://github.com/dhis2/capture-app/issues/3859)) ([edee6d3](https://github.com/dhis2/capture-app/commit/edee6d350fb2672a3470ef4c282460b34fa726eb)) + ## [101.14.2](https://github.com/dhis2/capture-app/compare/v101.14.1...v101.14.2) (2024-10-27) diff --git a/package.json b/package.json index 3ecab1f6b5..2d33e6f3b0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "capture-app", "homepage": ".", - "version": "101.14.2", + "version": "101.14.3", "cacheVersion": "7", "serverVersion": "38", "license": "BSD-3-Clause", @@ -10,7 +10,7 @@ "packages/rules-engine" ], "dependencies": { - "@dhis2/rules-engine-javascript": "101.14.2", + "@dhis2/rules-engine-javascript": "101.14.3", "@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 841958de6d..2cdebfcbf3 100644 --- a/packages/rules-engine/package.json +++ b/packages/rules-engine/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/rules-engine-javascript", - "version": "101.14.2", + "version": "101.14.3", "license": "BSD-3-Clause", "main": "./build/cjs/index.js", "scripts": { From 46568640482a3d6a610533573b1132c160329296 Mon Sep 17 00:00:00 2001 From: henrikmv <110386561+henrikmv@users.noreply.github.com> Date: Tue, 29 Oct 2024 14:09:37 +0100 Subject: [PATCH 06/14] fix: [DHIS2-18228] Image Deleted on Update (#3857) * fix: image deleted on update * fix: remove call to fileresources --- src/core_modules/capture-core/events/getSubValues.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/core_modules/capture-core/events/getSubValues.js b/src/core_modules/capture-core/events/getSubValues.js index 19b36daf2a..7d61eb702a 100644 --- a/src/core_modules/capture-core/events/getSubValues.js +++ b/src/core_modules/capture-core/events/getSubValues.js @@ -37,19 +37,23 @@ const subValueGetterByElementType = { return null; }), [dataElementTypes.IMAGE]: ({ + value, eventId, metaElementId, absoluteApiPath, }: { + value: any, eventId: string, metaElementId: string, absoluteApiPath: string, }) => (featureAvailable(FEATURES.trackerImageEndpoint) ? { + value, url: `${absoluteApiPath}/tracker/events/${eventId}/dataValues/${metaElementId}/image`, previewUrl: `${absoluteApiPath}/tracker/events/${eventId}/dataValues/${metaElementId}/image?dimension=small`, } : { + value, url: `${absoluteApiPath}/events/files?dataElementUid=${metaElementId}&eventUid=${eventId}`, previewUrl: `${absoluteApiPath}/events/files?dataElementUid=${metaElementId}&eventUid=${eventId}&dimension=SMALL`, } @@ -67,11 +71,13 @@ const subValueGetterByElementType = { }) => { const ouIds = value.split('/'); const id = ouIds[ouIds.length - 1]; - return querySingleResource({ resource: 'organisationUnits', + return querySingleResource({ + resource: 'organisationUnits', id, params: { fields: 'id,code,displayName,path', - } }) + }, + }) .then(res => ({ id: res.id, code: res.code, From ef57abf2c7955e79f77617d807c78e923af704db Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Tue, 29 Oct 2024 15:12:42 +0000 Subject: [PATCH 07/14] chore(release): cut 101.14.4 [skip release] ## [101.14.4](https://github.com/dhis2/capture-app/compare/v101.14.3...v101.14.4) (2024-10-29) ### Bug Fixes * [DHIS2-18228] Image Deleted on Update ([#3857](https://github.com/dhis2/capture-app/issues/3857)) ([4656864](https://github.com/dhis2/capture-app/commit/46568640482a3d6a610533573b1132c160329296)) --- CHANGELOG.md | 7 +++++++ package.json | 4 ++-- packages/rules-engine/package.json | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 390cde107f..4ec9917046 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [101.14.4](https://github.com/dhis2/capture-app/compare/v101.14.3...v101.14.4) (2024-10-29) + + +### Bug Fixes + +* [DHIS2-18228] Image Deleted on Update ([#3857](https://github.com/dhis2/capture-app/issues/3857)) ([4656864](https://github.com/dhis2/capture-app/commit/46568640482a3d6a610533573b1132c160329296)) + ## [101.14.3](https://github.com/dhis2/capture-app/compare/v101.14.2...v101.14.3) (2024-10-29) diff --git a/package.json b/package.json index 2d33e6f3b0..cb10cd10a4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "capture-app", "homepage": ".", - "version": "101.14.3", + "version": "101.14.4", "cacheVersion": "7", "serverVersion": "38", "license": "BSD-3-Clause", @@ -10,7 +10,7 @@ "packages/rules-engine" ], "dependencies": { - "@dhis2/rules-engine-javascript": "101.14.3", + "@dhis2/rules-engine-javascript": "101.14.4", "@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 2cdebfcbf3..33aba0adb7 100644 --- a/packages/rules-engine/package.json +++ b/packages/rules-engine/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/rules-engine-javascript", - "version": "101.14.3", + "version": "101.14.4", "license": "BSD-3-Clause", "main": "./build/cjs/index.js", "scripts": { From 31cb56c4f05727eb84fcc36e39f897cccc5627b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Storl=C3=B8kken=20Melseth?= Date: Fri, 1 Nov 2024 12:12:30 +0100 Subject: [PATCH 08/14] =?UTF-8?q?fix:=20[DHIS2-18248]=C2=A0pass=20on=20cre?= =?UTF-8?q?atedAt=20to=20rules=20engine=20when=20editing=20(#3848)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../VariableService/variableService.types.js | 1 + .../DataEntry/epics/editEventDataEntry.epics.js | 15 +++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/packages/rules-engine/src/services/VariableService/variableService.types.js b/packages/rules-engine/src/services/VariableService/variableService.types.js index 9640354c46..2977933c29 100644 --- a/packages/rules-engine/src/services/VariableService/variableService.types.js +++ b/packages/rules-engine/src/services/VariableService/variableService.types.js @@ -27,6 +27,7 @@ type EventMain = { +status?: $Values, +occurredAt?: string, +scheduledAt?: string, + +createdAt?: string, }; export type EventValues = { diff --git a/src/core_modules/capture-core/components/WidgetEventEdit/DataEntry/epics/editEventDataEntry.epics.js b/src/core_modules/capture-core/components/WidgetEventEdit/DataEntry/epics/editEventDataEntry.epics.js index 69d7a4ab24..05515b4bcc 100644 --- a/src/core_modules/capture-core/components/WidgetEventEdit/DataEntry/epics/editEventDataEntry.epics.js +++ b/src/core_modules/capture-core/components/WidgetEventEdit/DataEntry/epics/editEventDataEntry.epics.js @@ -65,14 +65,21 @@ const runRulesForEditSingleEvent = ({ if (program instanceof TrackerProgram) { const { enrollment, attributeValues } = state.enrollmentDomain; + const { apiOtherEvents, apiCurrentEventOriginal } = enrollment.events.reduce((acc, apiEvent) => { + if (apiEvent.event === currentEvent.eventId) { + acc.apiCurrentEventOriginal = apiEvent; + } else { + acc.apiOtherEvents.push(apiEvent); + } + return acc; + }, { apiOtherEvents: [] }); + effects = getApplicableRuleEffectsForTrackerProgram({ program, stage, orgUnit, - currentEvent, - otherEvents: prepareEnrollmentEventsForRulesEngine( - enrollment?.events.filter(enrollmentEvent => enrollmentEvent.event !== currentEvent.eventId), - ), + currentEvent: { ...currentEvent, createdAt: apiCurrentEventOriginal.createdAt }, + otherEvents: prepareEnrollmentEventsForRulesEngine(apiOtherEvents), enrollmentData: getEnrollmentForRulesEngine(enrollment), attributeValues: getAttributeValuesForRulesEngine(attributeValues, program.attributes), }); From 53c21f0a4942d09ae4bf88253b576de8ca94b9b6 Mon Sep 17 00:00:00 2001 From: Eirik Haugstulen Date: Fri, 1 Nov 2024 15:54:04 +0100 Subject: [PATCH 09/14] fix: [DHIS2-18238] incorrect criteria when saving list with follow up false (#3868) * fix: add undefined validation * chore: missing checks --- .../programStageTemplates.epics.js | 14 ++++---- .../epics/teiViewEpics/teiTemplates.epics.js | 14 ++++---- .../convertors.js | 10 +++--- .../DeleteConfirmationDialog.component.js | 33 ++++++------------ .../ExistingTemplateContents.component.js | 34 +++++++------------ .../NewTemplateContents.component.js | 20 +++++------ 6 files changed, 52 insertions(+), 73 deletions(-) diff --git a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/programStageTemplates.epics.js b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/programStageTemplates.epics.js index cbe1cda555..44f348f6e7 100644 --- a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/programStageTemplates.epics.js +++ b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/programStageTemplates.epics.js @@ -6,14 +6,14 @@ import { errorCreator } from 'capture-core-utils'; import { ofType } from 'redux-observable'; import { concatMap, filter, takeUntil } from 'rxjs/operators'; import { - workingListsCommonActionTypes, - addTemplateSuccess, addTemplateError, - deleteTemplateSuccess, + addTemplateSuccess, deleteTemplateError, - updateTemplateSuccess, - updateTemplateError, + deleteTemplateSuccess, updateDefaultTemplate, + updateTemplateError, + updateTemplateSuccess, + workingListsCommonActionTypes, workingListsCommonActionTypesBatchActionTypes, } from '../../../WorkingListsCommon'; import { TEI_WORKING_LISTS_TYPE } from '../../constants'; @@ -63,7 +63,7 @@ export const addProgramStageTemplateEpic = (action$: InputObservable, store: Red eventStatus: status, ...(assignedUserMode && { assignedUserMode }), ...(assignedUsers?.length > 0 && { assignedUsers }), - ...(followUp && { followUp }), + ...(followUp !== undefined && { followUp: JSON.stringify(followUp) }), ...(programStatus && { enrollmentStatus: programStatus }), ...(occurredAt && { enrollmentOccurredAt: occurredAt }), ...(eventOccurredAt && { eventOccurredAt }), @@ -212,7 +212,7 @@ export const updateProgramStageTemplateEpic = (action$: InputObservable, store: ...(assignedUsers?.length > 0 && { assignedUsers }), ...(programStatus && { enrollmentStatus: programStatus }), ...(occurredAt && { enrollmentOccurredAt: occurredAt }), - ...(followUp && { followUp }), + ...(followUp !== undefined && { followUp: JSON.stringify(followUp) }), ...(eventOccurredAt && { eventOccurredAt }), ...(scheduledAt && { eventScheduledAt: scheduledAt }), attributeValueFilters, diff --git a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/teiTemplates.epics.js b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/teiTemplates.epics.js index 0c275b3b09..308eb1c276 100644 --- a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/teiTemplates.epics.js +++ b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/teiTemplates.epics.js @@ -6,14 +6,14 @@ import { errorCreator } from 'capture-core-utils'; import { ofType } from 'redux-observable'; import { concatMap, filter, takeUntil } from 'rxjs/operators'; import { - workingListsCommonActionTypes, - addTemplateSuccess, addTemplateError, - deleteTemplateSuccess, + addTemplateSuccess, deleteTemplateError, - updateTemplateSuccess, - updateTemplateError, + deleteTemplateSuccess, updateDefaultTemplate, + updateTemplateError, + updateTemplateSuccess, + workingListsCommonActionTypes, workingListsCommonActionTypesBatchActionTypes, } from '../../../WorkingListsCommon'; import { TEI_WORKING_LISTS_TYPE } from '../../constants'; @@ -55,7 +55,7 @@ export const addTEITemplateEpic = (action$: InputObservable, store: ReduxStore, ...(assignedUserMode && { assignedUserMode }), ...(assignedUsers?.length > 0 && { assignedUsers }), ...(programStatus && { enrollmentStatus: programStatus }), - ...(!!followUp && { followUp }), + ...(followUp !== undefined && { followUp: JSON.stringify(followUp) }), ...(enrolledAt && { enrollmentCreatedDate: enrolledAt }), ...(occurredAt && { enrollmentIncidentDate: occurredAt }), ...(attributeValueFilters?.length > 0 && { attributeValueFilters }), @@ -173,10 +173,10 @@ export const updateTEITemplateEpic = (action$: InputObservable, store: ReduxStor order, ...(assignedUserMode && { assignedUserMode }), ...(assignedUsers?.length > 0 && { assignedUsers }), + ...(followUp !== undefined && { followUp: JSON.stringify(followUp) }), ...(programStatus && { enrollmentStatus: programStatus }), ...(enrolledAt && { enrollmentCreatedDate: enrolledAt }), ...(occurredAt && { enrollmentIncidentDate: occurredAt }), - ...(followUp && { followUp }), ...(attributeValueFilters?.length > 0 && { attributeValueFilters }), }, }; diff --git a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/helpers/TEIFilters/clientConfigToApiTEIFilterQueryConverter/convertors.js b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/helpers/TEIFilters/clientConfigToApiTEIFilterQueryConverter/convertors.js index 7236ae345b..ae66d8b171 100644 --- a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/helpers/TEIFilters/clientConfigToApiTEIFilterQueryConverter/convertors.js +++ b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/helpers/TEIFilters/clientConfigToApiTEIFilterQueryConverter/convertors.js @@ -1,12 +1,12 @@ // @flow import moment from 'moment'; import { - filterTypesObject, - dateFilterTypes, type BooleanFilterData, - type TextFilterData, - type NumericFilterData, type DateFilterData, + dateFilterTypes, + filterTypesObject, + type NumericFilterData, + type TextFilterData, } from '../../../../WorkingListsBase'; import type { ApiDataFilterBoolean, ApiDataFilterDateContents } from '../../../types'; import { ADDITIONAL_FILTERS } from '../../../helpers'; @@ -108,7 +108,7 @@ export const convertMainFilters = ({ } const mainValue = mainFiltersTable[key](filter); - if (mainValue) { + if (mainValue !== undefined) { if (key === MAIN_FILTERS.ASSIGNEE) { return { ...acc, ...mainValue }; } diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsBase/TemplateMaintenance/DeleteConfirmationDialog.component.js b/src/core_modules/capture-core/components/WorkingLists/WorkingListsBase/TemplateMaintenance/DeleteConfirmationDialog.component.js index 635bac6d3e..72c965d3da 100644 --- a/src/core_modules/capture-core/components/WorkingLists/WorkingListsBase/TemplateMaintenance/DeleteConfirmationDialog.component.js +++ b/src/core_modules/capture-core/components/WorkingLists/WorkingListsBase/TemplateMaintenance/DeleteConfirmationDialog.component.js @@ -1,31 +1,21 @@ // @flow import * as React from 'react'; -import { withStyles } from '@material-ui/core/styles'; import i18n from '@dhis2/d2-i18n'; -import { Button, Modal, ModalTitle, ModalContent, ModalActions } from '@dhis2/ui'; - -const getStyles = () => ({ - buttonContainer: { - display: 'flex', - justifyContent: 'space-between', - }, -}); +import { Button, ButtonStrip, Modal, ModalActions, ModalContent, ModalTitle } from '@dhis2/ui'; type Props = { open: boolean, onClose: () => void, onDeleteTemplate: () => void, templateName: string, - classes: Object, }; -const DeleteConfirmationDialogPlain = (props: Props) => { +export const DeleteConfirmationDialog = (props: Props) => { const { open, onClose, onDeleteTemplate, templateName, - classes, } = props; if (!open) { @@ -41,18 +31,17 @@ const DeleteConfirmationDialogPlain = (props: Props) => { {i18n.t('Do you really want to delete the \'{{templateName}}\' view?', { templateName })} - - - + + + + + ); }; -export const DeleteConfirmationDialog = withStyles(getStyles)(DeleteConfirmationDialogPlain); diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsBase/TemplateMaintenance/ExistingTemplateContents.component.js b/src/core_modules/capture-core/components/WorkingLists/WorkingListsBase/TemplateMaintenance/ExistingTemplateContents.component.js index 0efef529f0..993b30eb2d 100644 --- a/src/core_modules/capture-core/components/WorkingLists/WorkingListsBase/TemplateMaintenance/ExistingTemplateContents.component.js +++ b/src/core_modules/capture-core/components/WorkingLists/WorkingListsBase/TemplateMaintenance/ExistingTemplateContents.component.js @@ -1,40 +1,30 @@ // @flow import * as React from 'react'; -import { withStyles } from '@material-ui/core/styles'; import i18n from '@dhis2/d2-i18n'; -import { Button, ModalTitle, ModalContent, ModalActions } from '@dhis2/ui'; - -const getStyles = () => ({ - buttonContainer: { - display: 'flex', - justifyContent: 'space-between', - }, -}); +import { Button, ButtonStrip, ModalActions, ModalContent, ModalTitle } from '@dhis2/ui'; type Props = { onSaveTemplate: () => void, onClose: () => void, - classes: Object, }; -const ExistingTemplateContentsPlain = (props: Props) => { - const { onSaveTemplate, onClose, classes } = props; +export const ExistingTemplateContents = (props: Props) => { + const { onSaveTemplate, onClose } = props; return ( {i18n.t('Save')} - - - + + + + + ); }; -export const ExistingTemplateContents = withStyles(getStyles)(ExistingTemplateContentsPlain); diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsBase/TemplateMaintenance/NewTemplateContents.component.js b/src/core_modules/capture-core/components/WorkingLists/WorkingListsBase/TemplateMaintenance/NewTemplateContents.component.js index c064f74893..ca1a446e8f 100644 --- a/src/core_modules/capture-core/components/WorkingLists/WorkingListsBase/TemplateMaintenance/NewTemplateContents.component.js +++ b/src/core_modules/capture-core/components/WorkingLists/WorkingListsBase/TemplateMaintenance/NewTemplateContents.component.js @@ -1,6 +1,6 @@ // @flow import * as React from 'react'; -import { colors, Button, ModalTitle, ModalContent, ModalActions } from '@dhis2/ui'; +import { Button, ButtonStrip, colors, ModalActions, ModalContent, ModalTitle } from '@dhis2/ui'; import { withStyles } from '@material-ui/core/styles'; import i18n from '@dhis2/d2-i18n'; import { NewTemplateTextField } from './NewTemplateTextField.component'; @@ -64,15 +64,15 @@ const NewTemplateContentsPlain = (props: Props) => { {error} - - - + + + + + ); From 28e1f15d82b0da1aa93dba6bc3d1e6d2fba3b7a6 Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Fri, 1 Nov 2024 14:58:30 +0000 Subject: [PATCH 10/14] chore(release): cut 101.14.5 [skip release] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## [101.14.5](https://github.com/dhis2/capture-app/compare/v101.14.4...v101.14.5) (2024-11-01) ### Bug Fixes * [DHIS2-18238] incorrect criteria when saving list with follow up false ([#3868](https://github.com/dhis2/capture-app/issues/3868)) ([53c21f0](https://github.com/dhis2/capture-app/commit/53c21f0a4942d09ae4bf88253b576de8ca94b9b6)) * [DHIS2-18248] pass on createdAt to rules engine when editing ([#3848](https://github.com/dhis2/capture-app/issues/3848)) ([31cb56c](https://github.com/dhis2/capture-app/commit/31cb56c4f05727eb84fcc36e39f897cccc5627b3)) --- CHANGELOG.md | 8 ++++++++ package.json | 4 ++-- packages/rules-engine/package.json | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ec9917046..8136f020c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +## [101.14.5](https://github.com/dhis2/capture-app/compare/v101.14.4...v101.14.5) (2024-11-01) + + +### Bug Fixes + +* [DHIS2-18238] incorrect criteria when saving list with follow up false ([#3868](https://github.com/dhis2/capture-app/issues/3868)) ([53c21f0](https://github.com/dhis2/capture-app/commit/53c21f0a4942d09ae4bf88253b576de8ca94b9b6)) +* [DHIS2-18248] pass on createdAt to rules engine when editing ([#3848](https://github.com/dhis2/capture-app/issues/3848)) ([31cb56c](https://github.com/dhis2/capture-app/commit/31cb56c4f05727eb84fcc36e39f897cccc5627b3)) + ## [101.14.4](https://github.com/dhis2/capture-app/compare/v101.14.3...v101.14.4) (2024-10-29) diff --git a/package.json b/package.json index cb10cd10a4..c0edde4cd1 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "capture-app", "homepage": ".", - "version": "101.14.4", + "version": "101.14.5", "cacheVersion": "7", "serverVersion": "38", "license": "BSD-3-Clause", @@ -10,7 +10,7 @@ "packages/rules-engine" ], "dependencies": { - "@dhis2/rules-engine-javascript": "101.14.4", + "@dhis2/rules-engine-javascript": "101.14.5", "@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 33aba0adb7..459d5ca235 100644 --- a/packages/rules-engine/package.json +++ b/packages/rules-engine/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/rules-engine-javascript", - "version": "101.14.4", + "version": "101.14.5", "license": "BSD-3-Clause", "main": "./build/cjs/index.js", "scripts": { From facbee13d009d11e955a1a9b277e27ba41b63867 Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Sun, 3 Nov 2024 02:44:44 +0100 Subject: [PATCH 11/14] fix(translations): sync translations from transifex (master) Automatically merged. --- i18n/ar.po | 65 +++++++++------------------------ i18n/ar_IQ.po | 61 ++++++++----------------------- i18n/ckb.po | 65 +++++++++------------------------ i18n/km.po | 65 +++++++++------------------------ i18n/my.po | 65 +++++++++------------------------ i18n/prs.po | 61 ++++++++----------------------- i18n/ps.po | 65 +++++++++------------------------ i18n/pt.po | 36 +++++++++++------- i18n/pt_BR.po | 65 +++++++++------------------------ i18n/ro.po | 25 ++++++++----- i18n/ru.po | 27 ++++++++------ i18n/si.po | 91 ++++++++++++++++------------------------------ i18n/sv.po | 61 ++++++++----------------------- i18n/tet.po | 61 ++++++++----------------------- i18n/tg.po | 65 +++++++++------------------------ i18n/uk.po | 65 +++++++++------------------------ i18n/ur.po | 61 ++++++++----------------------- i18n/uz_UZ_Cyrl.po | 61 ++++++++----------------------- i18n/uz_UZ_Latn.po | 61 ++++++++----------------------- i18n/vi.po | 65 +++++++++------------------------ i18n/zh_CN.po | 25 ++++++++----- 21 files changed, 377 insertions(+), 839 deletions(-) diff --git a/i18n/ar.po b/i18n/ar.po index 2e69358014..bd06150d1f 100644 --- a/i18n/ar.po +++ b/i18n/ar.po @@ -2,15 +2,15 @@ # Translators: # KRG HIS , 2020 # Philip Larsen Donnelly, 2023 -# Hamza Assada <7amza.it@gmail.com>, 2024 # Viktor Varland , 2024 +# Hamza Assada <7amza.it@gmail.com>, 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-09-02T11:08:16.281Z\n" +"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" -"Last-Translator: Viktor Varland , 2024\n" +"Last-Translator: Hamza Assada <7amza.it@gmail.com>, 2024\n" "Language-Team: Arabic (https://app.transifex.com/hisp-uio/teams/100509/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -623,42 +623,6 @@ msgstr "" msgid "Close the notice" msgstr "" -msgid "Use new Enrollment dashboard for {{programName}}" -msgstr "" - -msgid "Opt in for {{programName}}" -msgstr "" - -msgid "" -"By clicking opt-in below, you will start using the new enrollment dashboard " -"in the Capture app for this Tracker program. At the moment, there is certain" -" functionality from Tracker Capture that has not yet been added, including " -"relationship and referral functionality. The work on including this Tracker " -"functionality in Capture is ongoing and will be added in upcoming app " -"releases." -msgstr "" - -msgid "" -"The core team appreciates any feedback on this new functionality which is " -"currently being beta tested, please report any issues and feedback in the " -"DHIS2 JIRA project." -msgstr "" - -msgid "" -"Click the button below to opt-in to the new enrollment dashboard " -"functionality in the Capture app (beta) for this Tracker program for all " -"users." -msgstr "" - -msgid "Yes, opt in" -msgstr "" - -msgid "Stop using new Enrollment dashboard for {{programName}}" -msgstr "" - -msgid "Opt out for {{programName}}" -msgstr "" - msgid "Enrollment with id \"{{enrollmentId}}\" does not exist" msgstr "" @@ -746,9 +710,6 @@ msgstr "" msgid "Page is missing required values from URL" msgstr "" -msgid "Program is not valid" -msgstr "" - msgid "Org unit is not valid with current program" msgstr "" @@ -1167,6 +1128,9 @@ msgstr "" msgid "Mark incomplete" msgstr "تعيين كـ غير مكتمل" +msgid "You do not have access to delete this enrollment" +msgstr "" + msgid "Delete enrollment" msgstr "الغِ التسجيل" @@ -1247,6 +1211,12 @@ msgstr "" msgid "Follow-up" msgstr "متابعة" +msgid "Started at{{escape}}" +msgstr "" + +msgid "Owned by{{escape}}" +msgstr "" + msgid "Cancelled" msgstr "الملغية" @@ -1443,11 +1413,6 @@ 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 "" @@ -1534,6 +1499,9 @@ msgstr "" msgid "No changes to display" msgstr "" +msgid "Updated" +msgstr "تم تحديثه" + msgid "Created" msgstr "تم الإنشاء" @@ -1552,6 +1520,9 @@ msgstr "عنصر بيانات" msgid "Change" msgstr "" +msgid "Value" +msgstr "القيمة" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" diff --git a/i18n/ar_IQ.po b/i18n/ar_IQ.po index 13422d6d58..f818d29a25 100644 --- a/i18n/ar_IQ.po +++ b/i18n/ar_IQ.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-09-02T11:08:16.281Z\n" +"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: KRG HIS , 2024\n" "Language-Team: Arabic (Iraq) (https://app.transifex.com/hisp-uio/teams/100509/ar_IQ/)\n" @@ -620,42 +620,6 @@ msgstr "" msgid "Close the notice" msgstr "" -msgid "Use new Enrollment dashboard for {{programName}}" -msgstr "" - -msgid "Opt in for {{programName}}" -msgstr "" - -msgid "" -"By clicking opt-in below, you will start using the new enrollment dashboard " -"in the Capture app for this Tracker program. At the moment, there is certain" -" functionality from Tracker Capture that has not yet been added, including " -"relationship and referral functionality. The work on including this Tracker " -"functionality in Capture is ongoing and will be added in upcoming app " -"releases." -msgstr "" - -msgid "" -"The core team appreciates any feedback on this new functionality which is " -"currently being beta tested, please report any issues and feedback in the " -"DHIS2 JIRA project." -msgstr "" - -msgid "" -"Click the button below to opt-in to the new enrollment dashboard " -"functionality in the Capture app (beta) for this Tracker program for all " -"users." -msgstr "" - -msgid "Yes, opt in" -msgstr "" - -msgid "Stop using new Enrollment dashboard for {{programName}}" -msgstr "" - -msgid "Opt out for {{programName}}" -msgstr "" - msgid "Enrollment with id \"{{enrollmentId}}\" does not exist" msgstr "" @@ -743,9 +707,6 @@ msgstr "" msgid "Page is missing required values from URL" msgstr "" -msgid "Program is not valid" -msgstr "" - msgid "Org unit is not valid with current program" msgstr "" @@ -1162,6 +1123,9 @@ msgstr "" msgid "Mark incomplete" msgstr "" +msgid "You do not have access to delete this enrollment" +msgstr "" + msgid "Delete enrollment" msgstr "" @@ -1242,6 +1206,12 @@ msgstr "" msgid "Follow-up" msgstr "" +msgid "Started at{{escape}}" +msgstr "" + +msgid "Owned by{{escape}}" +msgstr "" + msgid "Cancelled" msgstr "تم الإلغاء" @@ -1438,11 +1408,6 @@ 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 "" @@ -1529,6 +1494,9 @@ msgstr "" msgid "No changes to display" msgstr "" +msgid "Updated" +msgstr "" + msgid "Created" msgstr "تم الإنشاء" @@ -1547,6 +1515,9 @@ msgstr "" msgid "Change" msgstr "" +msgid "Value" +msgstr "القيمة" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" diff --git a/i18n/ckb.po b/i18n/ckb.po index 851ae43bd0..54b435b433 100644 --- a/i18n/ckb.po +++ b/i18n/ckb.po @@ -2,15 +2,15 @@ # Translators: # Antonia Bezenchek , 2021 # KRG HIS , 2021 -# Viktor Varland , 2022 # Philip Larsen Donnelly, 2024 +# Viktor Varland , 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-09-02T11:08:16.281Z\n" +"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" -"Last-Translator: Philip Larsen Donnelly, 2024\n" +"Last-Translator: Viktor Varland , 2024\n" "Language-Team: Central Kurdish (https://app.transifex.com/hisp-uio/teams/100509/ckb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -625,42 +625,6 @@ msgstr "" msgid "Close the notice" msgstr "" -msgid "Use new Enrollment dashboard for {{programName}}" -msgstr "" - -msgid "Opt in for {{programName}}" -msgstr "" - -msgid "" -"By clicking opt-in below, you will start using the new enrollment dashboard " -"in the Capture app for this Tracker program. At the moment, there is certain" -" functionality from Tracker Capture that has not yet been added, including " -"relationship and referral functionality. The work on including this Tracker " -"functionality in Capture is ongoing and will be added in upcoming app " -"releases." -msgstr "" - -msgid "" -"The core team appreciates any feedback on this new functionality which is " -"currently being beta tested, please report any issues and feedback in the " -"DHIS2 JIRA project." -msgstr "" - -msgid "" -"Click the button below to opt-in to the new enrollment dashboard " -"functionality in the Capture app (beta) for this Tracker program for all " -"users." -msgstr "" - -msgid "Yes, opt in" -msgstr "" - -msgid "Stop using new Enrollment dashboard for {{programName}}" -msgstr "" - -msgid "Opt out for {{programName}}" -msgstr "" - msgid "Enrollment with id \"{{enrollmentId}}\" does not exist" msgstr "" @@ -748,9 +712,6 @@ msgstr "" msgid "Page is missing required values from URL" msgstr "" -msgid "Program is not valid" -msgstr "" - msgid "Org unit is not valid with current program" msgstr "" @@ -1165,6 +1126,9 @@ msgstr "" msgid "Mark incomplete" msgstr "" +msgid "You do not have access to delete this enrollment" +msgstr "" + msgid "Delete enrollment" msgstr "" @@ -1245,6 +1209,12 @@ msgstr "" msgid "Follow-up" msgstr "" +msgid "Started at{{escape}}" +msgstr "" + +msgid "Owned by{{escape}}" +msgstr "" + msgid "Cancelled" msgstr "" @@ -1433,11 +1403,6 @@ 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 "" @@ -1520,6 +1485,9 @@ msgstr "" msgid "No changes to display" msgstr "" +msgid "Updated" +msgstr "" + msgid "Created" msgstr "" @@ -1538,6 +1506,9 @@ msgstr "" msgid "Change" msgstr "" +msgid "Value" +msgstr "بةها" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" diff --git a/i18n/km.po b/i18n/km.po index ec9c3dac3e..f203f663af 100644 --- a/i18n/km.po +++ b/i18n/km.po @@ -1,15 +1,15 @@ # # Translators: # channara rin, 2023 -# Philip Larsen Donnelly, 2024 # Viktor Varland , 2024 +# Philip Larsen Donnelly, 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-09-02T11:08:16.281Z\n" +"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" -"Last-Translator: Viktor Varland , 2024\n" +"Last-Translator: Philip Larsen Donnelly, 2024\n" "Language-Team: Khmer (https://app.transifex.com/hisp-uio/teams/100509/km/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -607,42 +607,6 @@ msgstr "" msgid "Close the notice" msgstr "" -msgid "Use new Enrollment dashboard for {{programName}}" -msgstr "" - -msgid "Opt in for {{programName}}" -msgstr "" - -msgid "" -"By clicking opt-in below, you will start using the new enrollment dashboard " -"in the Capture app for this Tracker program. At the moment, there is certain" -" functionality from Tracker Capture that has not yet been added, including " -"relationship and referral functionality. The work on including this Tracker " -"functionality in Capture is ongoing and will be added in upcoming app " -"releases." -msgstr "" - -msgid "" -"The core team appreciates any feedback on this new functionality which is " -"currently being beta tested, please report any issues and feedback in the " -"DHIS2 JIRA project." -msgstr "" - -msgid "" -"Click the button below to opt-in to the new enrollment dashboard " -"functionality in the Capture app (beta) for this Tracker program for all " -"users." -msgstr "" - -msgid "Yes, opt in" -msgstr "" - -msgid "Stop using new Enrollment dashboard for {{programName}}" -msgstr "" - -msgid "Opt out for {{programName}}" -msgstr "" - msgid "Enrollment with id \"{{enrollmentId}}\" does not exist" msgstr "" @@ -730,9 +694,6 @@ msgstr "" msgid "Page is missing required values from URL" msgstr "" -msgid "Program is not valid" -msgstr "" - msgid "Org unit is not valid with current program" msgstr "" @@ -1144,6 +1105,9 @@ msgstr "" msgid "Mark incomplete" msgstr "" +msgid "You do not have access to delete this enrollment" +msgstr "" + msgid "Delete enrollment" msgstr "" @@ -1224,6 +1188,12 @@ msgstr "" msgid "Follow-up" msgstr "តាមដាន" +msgid "Started at{{escape}}" +msgstr "" + +msgid "Owned by{{escape}}" +msgstr "" + msgid "Cancelled" msgstr "បានលុបចោល" @@ -1410,11 +1380,6 @@ 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 "" @@ -1496,6 +1461,9 @@ msgstr "" msgid "No changes to display" msgstr "" +msgid "Updated" +msgstr "" + msgid "Created" msgstr "" @@ -1514,6 +1482,9 @@ msgstr "" msgid "Change" msgstr "" +msgid "Value" +msgstr "តម្លៃ" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" diff --git a/i18n/my.po b/i18n/my.po index 1416f92911..e86c5d5eca 100644 --- a/i18n/my.po +++ b/i18n/my.po @@ -1,16 +1,16 @@ # # Translators: # Wanda , 2021 -# Philip Larsen Donnelly, 2024 # Aung Kyi Min , 2024 # Viktor Varland , 2024 +# Philip Larsen Donnelly, 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-09-02T11:08:16.281Z\n" +"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" -"Last-Translator: Viktor Varland , 2024\n" +"Last-Translator: Philip Larsen Donnelly, 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" @@ -608,42 +608,6 @@ msgstr "" msgid "Close the notice" msgstr "" -msgid "Use new Enrollment dashboard for {{programName}}" -msgstr "" - -msgid "Opt in for {{programName}}" -msgstr "" - -msgid "" -"By clicking opt-in below, you will start using the new enrollment dashboard " -"in the Capture app for this Tracker program. At the moment, there is certain" -" functionality from Tracker Capture that has not yet been added, including " -"relationship and referral functionality. The work on including this Tracker " -"functionality in Capture is ongoing and will be added in upcoming app " -"releases." -msgstr "" - -msgid "" -"The core team appreciates any feedback on this new functionality which is " -"currently being beta tested, please report any issues and feedback in the " -"DHIS2 JIRA project." -msgstr "" - -msgid "" -"Click the button below to opt-in to the new enrollment dashboard " -"functionality in the Capture app (beta) for this Tracker program for all " -"users." -msgstr "" - -msgid "Yes, opt in" -msgstr "" - -msgid "Stop using new Enrollment dashboard for {{programName}}" -msgstr "" - -msgid "Opt out for {{programName}}" -msgstr "" - msgid "Enrollment with id \"{{enrollmentId}}\" does not exist" msgstr "" @@ -731,9 +695,6 @@ msgstr "" msgid "Page is missing required values from URL" msgstr "" -msgid "Program is not valid" -msgstr "" - msgid "Org unit is not valid with current program" msgstr "" @@ -1145,6 +1106,9 @@ msgstr "" msgid "Mark incomplete" msgstr "" +msgid "You do not have access to delete this enrollment" +msgstr "" + msgid "Delete enrollment" msgstr "" @@ -1225,6 +1189,12 @@ msgstr "" msgid "Follow-up" msgstr "စောင့်ကြပ်ကြည့်ရှုခြင်း" +msgid "Started at{{escape}}" +msgstr "" + +msgid "Owned by{{escape}}" +msgstr "" + msgid "Cancelled" msgstr "" @@ -1411,11 +1381,6 @@ 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 "" @@ -1497,6 +1462,9 @@ msgstr "" msgid "No changes to display" msgstr "" +msgid "Updated" +msgstr "" + msgid "Created" msgstr "" @@ -1515,6 +1483,9 @@ msgstr "" msgid "Change" msgstr "" +msgid "Value" +msgstr "တန်ဖိုး" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" diff --git a/i18n/prs.po b/i18n/prs.po index 9b6cbf8306..76198d8d85 100644 --- a/i18n/prs.po +++ b/i18n/prs.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-09-02T11:08:16.281Z\n" +"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Philip Larsen Donnelly, 2024\n" "Language-Team: Persian (Afghanistan) (https://app.transifex.com/hisp-uio/teams/100509/fa_AF/)\n" @@ -606,42 +606,6 @@ msgstr "" msgid "Close the notice" msgstr "" -msgid "Use new Enrollment dashboard for {{programName}}" -msgstr "" - -msgid "Opt in for {{programName}}" -msgstr "" - -msgid "" -"By clicking opt-in below, you will start using the new enrollment dashboard " -"in the Capture app for this Tracker program. At the moment, there is certain" -" functionality from Tracker Capture that has not yet been added, including " -"relationship and referral functionality. The work on including this Tracker " -"functionality in Capture is ongoing and will be added in upcoming app " -"releases." -msgstr "" - -msgid "" -"The core team appreciates any feedback on this new functionality which is " -"currently being beta tested, please report any issues and feedback in the " -"DHIS2 JIRA project." -msgstr "" - -msgid "" -"Click the button below to opt-in to the new enrollment dashboard " -"functionality in the Capture app (beta) for this Tracker program for all " -"users." -msgstr "" - -msgid "Yes, opt in" -msgstr "" - -msgid "Stop using new Enrollment dashboard for {{programName}}" -msgstr "" - -msgid "Opt out for {{programName}}" -msgstr "" - msgid "Enrollment with id \"{{enrollmentId}}\" does not exist" msgstr "" @@ -729,9 +693,6 @@ msgstr "" msgid "Page is missing required values from URL" msgstr "" -msgid "Program is not valid" -msgstr "" - msgid "Org unit is not valid with current program" msgstr "" @@ -1144,6 +1105,9 @@ msgstr "" msgid "Mark incomplete" msgstr "" +msgid "You do not have access to delete this enrollment" +msgstr "" + msgid "Delete enrollment" msgstr "حذف شمولیت" @@ -1224,6 +1188,12 @@ msgstr "" msgid "Follow-up" msgstr "تعقیب کردن" +msgid "Started at{{escape}}" +msgstr "" + +msgid "Owned by{{escape}}" +msgstr "" + msgid "Cancelled" msgstr "" @@ -1412,11 +1382,6 @@ 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 "" @@ -1499,6 +1464,9 @@ msgstr "" msgid "No changes to display" msgstr "" +msgid "Updated" +msgstr "" + msgid "Created" msgstr "ایجاد شده" @@ -1517,6 +1485,9 @@ msgstr "" msgid "Change" msgstr "" +msgid "Value" +msgstr "مقدار" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" diff --git a/i18n/ps.po b/i18n/ps.po index 38518df9a7..f8acba0571 100644 --- a/i18n/ps.po +++ b/i18n/ps.po @@ -1,14 +1,14 @@ # # Translators: -# Philip Larsen Donnelly, 2024 # Viktor Varland , 2024 +# Philip Larsen Donnelly, 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-09-02T11:08:16.281Z\n" +"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" -"Last-Translator: Viktor Varland , 2024\n" +"Last-Translator: Philip Larsen Donnelly, 2024\n" "Language-Team: Pashto (https://app.transifex.com/hisp-uio/teams/100509/ps/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -607,42 +607,6 @@ msgstr "" msgid "Close the notice" msgstr "" -msgid "Use new Enrollment dashboard for {{programName}}" -msgstr "" - -msgid "Opt in for {{programName}}" -msgstr "" - -msgid "" -"By clicking opt-in below, you will start using the new enrollment dashboard " -"in the Capture app for this Tracker program. At the moment, there is certain" -" functionality from Tracker Capture that has not yet been added, including " -"relationship and referral functionality. The work on including this Tracker " -"functionality in Capture is ongoing and will be added in upcoming app " -"releases." -msgstr "" - -msgid "" -"The core team appreciates any feedback on this new functionality which is " -"currently being beta tested, please report any issues and feedback in the " -"DHIS2 JIRA project." -msgstr "" - -msgid "" -"Click the button below to opt-in to the new enrollment dashboard " -"functionality in the Capture app (beta) for this Tracker program for all " -"users." -msgstr "" - -msgid "Yes, opt in" -msgstr "" - -msgid "Stop using new Enrollment dashboard for {{programName}}" -msgstr "" - -msgid "Opt out for {{programName}}" -msgstr "" - msgid "Enrollment with id \"{{enrollmentId}}\" does not exist" msgstr "" @@ -730,9 +694,6 @@ msgstr "" msgid "Page is missing required values from URL" msgstr "" -msgid "Program is not valid" -msgstr "" - msgid "Org unit is not valid with current program" msgstr "" @@ -1145,6 +1106,9 @@ msgstr "" msgid "Mark incomplete" msgstr "" +msgid "You do not have access to delete this enrollment" +msgstr "" + msgid "Delete enrollment" msgstr "د شمولیت حذفول" @@ -1225,6 +1189,12 @@ msgstr "" msgid "Follow-up" msgstr "" +msgid "Started at{{escape}}" +msgstr "" + +msgid "Owned by{{escape}}" +msgstr "" + msgid "Cancelled" msgstr "لغوه شوی" @@ -1413,11 +1383,6 @@ 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 "" @@ -1500,6 +1465,9 @@ msgstr "" msgid "No changes to display" msgstr "" +msgid "Updated" +msgstr "" + msgid "Created" msgstr "ایجاد شوی دی" @@ -1518,6 +1486,9 @@ msgstr "" msgid "Change" msgstr "" +msgid "Value" +msgstr "ارزښت یا رقم" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" diff --git a/i18n/pt.po b/i18n/pt.po index 0f02ab2cdc..1a05f44f6b 100644 --- a/i18n/pt.po +++ b/i18n/pt.po @@ -4,17 +4,20 @@ # Fernando Jorge Bade, 2023 # Philip Larsen Donnelly, 2024 # Gabriela Rodriguez , 2024 -# Sheila André , 2024 # Ge Joao , 2024 # Viktor Varland , 2024 # Juan M Alcantara Acosta , 2024 +# Sheila André , 2024 +# Jason Pickering , 2024 +# Helton Dias, 2024 +# Shelsea Chumaio, 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-10-14T14:53:34.553Z\n" +"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" -"Last-Translator: Juan M Alcantara Acosta , 2024\n" +"Last-Translator: Shelsea Chumaio, 2024\n" "Language-Team: Portuguese (https://app.transifex.com/hisp-uio/teams/100509/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -531,7 +534,7 @@ msgid "Type to filter options" msgstr "" msgid "No match found" -msgstr "" +msgstr "Nenhuma correspondência encontrada" msgid "Search" msgstr "Pesquisar" @@ -730,9 +733,6 @@ msgstr "Veja a lista de trabalho neste programa." msgid "Page is missing required values from URL" msgstr "A página tem em falta os valores obrigatórios do URL" -msgid "Program is not valid" -msgstr "O programa não é válido" - msgid "Org unit is not valid with current program" msgstr "A unidade organizacional não é válida com o programa atual" @@ -1166,6 +1166,9 @@ msgstr "Marcar como cancelado" msgid "Mark incomplete" msgstr "Marca incompleta" +msgid "You do not have access to delete this enrollment" +msgstr "" + msgid "Delete enrollment" msgstr "Excluir inscrição" @@ -1186,7 +1189,7 @@ msgid "Mark for follow-up" msgstr "Marcar para acompanhamento" msgid "Transfer" -msgstr "" +msgstr "Transferir" msgid "An error occurred while transferring ownership" msgstr "" @@ -1250,6 +1253,12 @@ msgstr "" msgid "Follow-up" msgstr "Acompanhamento" +msgid "Started at{{escape}}" +msgstr "" + +msgid "Owned by{{escape}}" +msgstr "" + msgid "Cancelled" msgstr "Cancelado" @@ -1452,11 +1461,6 @@ 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 "" @@ -1543,6 +1547,9 @@ msgstr "Registo de mudanças" msgid "No changes to display" msgstr "" +msgid "Updated" +msgstr "Actualizado" + msgid "Created" msgstr "Criado" @@ -1561,6 +1568,9 @@ msgstr "Item de dados" msgid "Change" msgstr "" +msgid "Value" +msgstr "Valor" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" diff --git a/i18n/pt_BR.po b/i18n/pt_BR.po index f33904fb18..dde9b5e1e0 100644 --- a/i18n/pt_BR.po +++ b/i18n/pt_BR.po @@ -1,16 +1,16 @@ # # Translators: # Oscar Mesones Lapouble , 2021 -# Philip Larsen Donnelly, 2024 # Viktor Varland , 2024 # Thiago Rocha, 2024 +# Philip Larsen Donnelly, 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-09-02T11:08:16.281Z\n" +"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" -"Last-Translator: Thiago Rocha, 2024\n" +"Last-Translator: Philip Larsen Donnelly, 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" @@ -610,42 +610,6 @@ msgstr "" msgid "Close the notice" msgstr "" -msgid "Use new Enrollment dashboard for {{programName}}" -msgstr "" - -msgid "Opt in for {{programName}}" -msgstr "" - -msgid "" -"By clicking opt-in below, you will start using the new enrollment dashboard " -"in the Capture app for this Tracker program. At the moment, there is certain" -" functionality from Tracker Capture that has not yet been added, including " -"relationship and referral functionality. The work on including this Tracker " -"functionality in Capture is ongoing and will be added in upcoming app " -"releases." -msgstr "" - -msgid "" -"The core team appreciates any feedback on this new functionality which is " -"currently being beta tested, please report any issues and feedback in the " -"DHIS2 JIRA project." -msgstr "" - -msgid "" -"Click the button below to opt-in to the new enrollment dashboard " -"functionality in the Capture app (beta) for this Tracker program for all " -"users." -msgstr "" - -msgid "Yes, opt in" -msgstr "" - -msgid "Stop using new Enrollment dashboard for {{programName}}" -msgstr "" - -msgid "Opt out for {{programName}}" -msgstr "" - msgid "Enrollment with id \"{{enrollmentId}}\" does not exist" msgstr "" @@ -733,9 +697,6 @@ msgstr "" msgid "Page is missing required values from URL" msgstr "" -msgid "Program is not valid" -msgstr "" - msgid "Org unit is not valid with current program" msgstr "" @@ -1149,6 +1110,9 @@ msgstr "" msgid "Mark incomplete" msgstr "" +msgid "You do not have access to delete this enrollment" +msgstr "" + msgid "Delete enrollment" msgstr "Excluir inscrição" @@ -1229,6 +1193,12 @@ msgstr "" msgid "Follow-up" msgstr "Seguimento" +msgid "Started at{{escape}}" +msgstr "" + +msgid "Owned by{{escape}}" +msgstr "" + msgid "Cancelled" msgstr "Cancelado" @@ -1419,11 +1389,6 @@ 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 "" @@ -1507,6 +1472,9 @@ msgstr "" msgid "No changes to display" msgstr "" +msgid "Updated" +msgstr "" + msgid "Created" msgstr "Criado" @@ -1525,6 +1493,9 @@ msgstr "" msgid "Change" msgstr "" +msgid "Value" +msgstr "Valor" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" diff --git a/i18n/ro.po b/i18n/ro.po index ee6543821a..ee369e5446 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-10-14T14:53:34.553Z\n" +"POT-Creation-Date: 2024-10-25T18:18:11.518Z\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" @@ -708,9 +708,6 @@ msgstr "" msgid "Page is missing required values from URL" msgstr "În pagină lipsesc valorile obligatorii din URL" -msgid "Program is not valid" -msgstr "Programul nu este valid" - msgid "Org unit is not valid with current program" msgstr "Unitatea organizațională nu este validă cu programul curent" @@ -1130,6 +1127,9 @@ msgstr "Marcare ca anulat" msgid "Mark incomplete" msgstr "Marcare ca incomplet" +msgid "You do not have access to delete this enrollment" +msgstr "" + msgid "Delete enrollment" msgstr "Lichidare înrolare" @@ -1210,6 +1210,12 @@ msgstr "" msgid "Follow-up" msgstr "" +msgid "Started at{{escape}}" +msgstr "" + +msgid "Owned by{{escape}}" +msgstr "" + msgid "Cancelled" msgstr "Anulat" @@ -1401,11 +1407,6 @@ 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 "" @@ -1489,6 +1490,9 @@ msgstr "" msgid "No changes to display" msgstr "" +msgid "Updated" +msgstr "" + msgid "Created" msgstr "" @@ -1507,6 +1511,9 @@ msgstr "" msgid "Change" msgstr "" +msgid "Value" +msgstr "" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" diff --git a/i18n/ru.po b/i18n/ru.po index 68ea9d95c7..23d7e47cd1 100644 --- a/i18n/ru.po +++ b/i18n/ru.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-10-14T14:53:34.553Z\n" +"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Philip Larsen Donnelly, 2024\n" "Language-Team: Russian (https://app.transifex.com/hisp-uio/teams/100509/ru/)\n" @@ -735,9 +735,6 @@ msgstr "Просмотреть рабочий список в данной пр msgid "Page is missing required values from URL" msgstr "Страница не содержит необходимых данных в URL адресе" -msgid "Program is not valid" -msgstr "Программа недействительна" - msgid "Org unit is not valid with current program" msgstr "Организационная единица не действительна для данной программы" @@ -1170,6 +1167,9 @@ msgstr "Присвоить метку \"Отменено\"" msgid "Mark incomplete" msgstr " Присвоить метку \"Незавершено\"" +msgid "You do not have access to delete this enrollment" +msgstr "" + msgid "Delete enrollment" msgstr "Удалить регистрационную запись" @@ -1262,6 +1262,12 @@ msgstr "" msgid "Follow-up" msgstr "Наблюдать" +msgid "Started at{{escape}}" +msgstr "" + +msgid "Owned by{{escape}}" +msgstr "" + msgid "Cancelled" msgstr "Отменен/а/о" @@ -1483,13 +1489,6 @@ msgstr "" msgid "Ambiguous relationships, contact system administrator" msgstr "Неопределенные связи, обратитесь к системному администратору" -msgid "" -"Enter {{linkableStageLabel}} details in the next step after completing this " -"{{currentStageLabel}}." -msgstr "" -"Ввести данные этапа {{linkableStageLabel}} на следующем шаге после " -"заполнения данных данного этапа {{currentStageLabel}}." - msgid "Enter details now" msgstr "Ввести данные сейчас" @@ -1574,6 +1573,9 @@ msgstr "Лог изменений" msgid "No changes to display" msgstr "Нет изменений для отображения" +msgid "Updated" +msgstr "Обновлено" + msgid "Created" msgstr "Создан/а/о" @@ -1592,6 +1594,9 @@ msgstr "Переменная" msgid "Change" msgstr "Изменить" +msgid "Value" +msgstr "Значение" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "Новая связь для объекта {{trackedEntityTypeName}} " diff --git a/i18n/si.po b/i18n/si.po index 996801aea5..35f0e324d6 100644 --- a/i18n/si.po +++ b/i18n/si.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n" +"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Malinda Wijeratne, 2024\n" "Language-Team: Sinhala (https://app.transifex.com/hisp-uio/teams/100509/si/)\n" @@ -588,15 +588,6 @@ msgstr "" msgid "Selected program is invalid for selected organisation unit" msgstr "" -msgid "Online" -msgstr "" - -msgid "Offline" -msgstr "" - -msgid "Syncing" -msgstr "" - msgid "Add note" msgstr "" @@ -615,42 +606,6 @@ msgstr "" msgid "Close the notice" msgstr "" -msgid "Use new Enrollment dashboard for {{programName}}" -msgstr "" - -msgid "Opt in for {{programName}}" -msgstr "" - -msgid "" -"By clicking opt-in below, you will start using the new enrollment dashboard " -"in the Capture app for this Tracker program. At the moment, there is certain" -" functionality from Tracker Capture that has not yet been added, including " -"relationship and referral functionality. The work on including this Tracker " -"functionality in Capture is ongoing and will be added in upcoming app " -"releases." -msgstr "" - -msgid "" -"The core team appreciates any feedback on this new functionality which is " -"currently being beta tested, please report any issues and feedback in the " -"DHIS2 JIRA project." -msgstr "" - -msgid "" -"Click the button below to opt-in to the new enrollment dashboard " -"functionality in the Capture app (beta) for this Tracker program for all " -"users." -msgstr "" - -msgid "Yes, opt in" -msgstr "" - -msgid "Stop using new Enrollment dashboard for {{programName}}" -msgstr "" - -msgid "Opt out for {{programName}}" -msgstr "" - msgid "Enrollment with id \"{{enrollmentId}}\" does not exist" msgstr "" @@ -738,9 +693,6 @@ msgstr "" msgid "Page is missing required values from URL" msgstr "" -msgid "Program is not valid" -msgstr "" - msgid "Org unit is not valid with current program" msgstr "" @@ -1153,6 +1105,9 @@ msgstr "" msgid "Mark incomplete" msgstr "අසම්පූර්ණ බව සලකුණු කරන්න" +msgid "You do not have access to delete this enrollment" +msgstr "" + msgid "Delete enrollment" msgstr "" @@ -1233,10 +1188,10 @@ msgstr "" msgid "Follow-up" msgstr "" -msgid "Started at {{orgUnitName}}" +msgid "Started at{{escape}}" msgstr "" -msgid "Owned by {{ownerOrgUnit}}" +msgid "Owned by{{escape}}" msgstr "" msgid "Cancelled" @@ -1293,6 +1248,9 @@ msgstr "" msgid "Event completed" msgstr "" +msgid "The event cannot be edited after it has been completed" +msgstr "" + msgid "Back to all stages and events" msgstr "" @@ -1424,11 +1382,6 @@ 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 "" @@ -1453,13 +1406,27 @@ msgstr "" msgid "New {{ eventName }} event" msgstr "" -msgid "To open this event, please wait until saving is complete" +msgid "An error occurred while deleting the event" msgstr "" -msgid "Show {{ rest }} more" +msgid "" +"Deleting an event is permanent and cannot be undone. Are you sure you want " +"to delete this event?" msgstr "" -msgid "Reset list" +msgid "An error occurred when updating event status" +msgstr "" + +msgid "Unskip" +msgstr "" + +msgid "Skip" +msgstr "" + +msgid "To open this event, please wait until saving is complete" +msgstr "" + +msgid "Show {{ rest }} more" msgstr "" msgid "Go to full {{ eventName }}" @@ -1497,6 +1464,9 @@ msgstr "" msgid "No changes to display" msgstr "" +msgid "Updated" +msgstr "" + msgid "Created" msgstr "" @@ -1515,6 +1485,9 @@ msgstr "" msgid "Change" msgstr "" +msgid "Value" +msgstr "අගය" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" diff --git a/i18n/sv.po b/i18n/sv.po index e771dc9cec..6e16f66d26 100644 --- a/i18n/sv.po +++ b/i18n/sv.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-09-02T11:08:16.281Z\n" +"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Viktor Varland , 2024\n" "Language-Team: Swedish (https://app.transifex.com/hisp-uio/teams/100509/sv/)\n" @@ -609,42 +609,6 @@ msgstr "" msgid "Close the notice" msgstr "" -msgid "Use new Enrollment dashboard for {{programName}}" -msgstr "" - -msgid "Opt in for {{programName}}" -msgstr "" - -msgid "" -"By clicking opt-in below, you will start using the new enrollment dashboard " -"in the Capture app for this Tracker program. At the moment, there is certain" -" functionality from Tracker Capture that has not yet been added, including " -"relationship and referral functionality. The work on including this Tracker " -"functionality in Capture is ongoing and will be added in upcoming app " -"releases." -msgstr "" - -msgid "" -"The core team appreciates any feedback on this new functionality which is " -"currently being beta tested, please report any issues and feedback in the " -"DHIS2 JIRA project." -msgstr "" - -msgid "" -"Click the button below to opt-in to the new enrollment dashboard " -"functionality in the Capture app (beta) for this Tracker program for all " -"users." -msgstr "" - -msgid "Yes, opt in" -msgstr "" - -msgid "Stop using new Enrollment dashboard for {{programName}}" -msgstr "" - -msgid "Opt out for {{programName}}" -msgstr "" - msgid "Enrollment with id \"{{enrollmentId}}\" does not exist" msgstr "" @@ -732,9 +696,6 @@ msgstr "" msgid "Page is missing required values from URL" msgstr "" -msgid "Program is not valid" -msgstr "" - msgid "Org unit is not valid with current program" msgstr "" @@ -1147,6 +1108,9 @@ msgstr "" msgid "Mark incomplete" msgstr "" +msgid "You do not have access to delete this enrollment" +msgstr "" + msgid "Delete enrollment" msgstr "" @@ -1227,6 +1191,12 @@ msgstr "" msgid "Follow-up" msgstr "" +msgid "Started at{{escape}}" +msgstr "" + +msgid "Owned by{{escape}}" +msgstr "" + msgid "Cancelled" msgstr "Avbruten" @@ -1415,11 +1385,6 @@ 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 "" @@ -1502,6 +1467,9 @@ msgstr "" msgid "No changes to display" msgstr "" +msgid "Updated" +msgstr "Uppdaterad" + msgid "Created" msgstr "Skapad" @@ -1520,6 +1488,9 @@ msgstr "" msgid "Change" msgstr "" +msgid "Value" +msgstr "Värde" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" diff --git a/i18n/tet.po b/i18n/tet.po index d268e14ea8..4757d41fce 100644 --- a/i18n/tet.po +++ b/i18n/tet.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-09-02T11:08:16.281Z\n" +"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Philip Larsen Donnelly, 2024\n" "Language-Team: Tetum (Tetun) (https://app.transifex.com/hisp-uio/teams/100509/tet/)\n" @@ -606,42 +606,6 @@ msgstr "" msgid "Close the notice" msgstr "" -msgid "Use new Enrollment dashboard for {{programName}}" -msgstr "" - -msgid "Opt in for {{programName}}" -msgstr "" - -msgid "" -"By clicking opt-in below, you will start using the new enrollment dashboard " -"in the Capture app for this Tracker program. At the moment, there is certain" -" functionality from Tracker Capture that has not yet been added, including " -"relationship and referral functionality. The work on including this Tracker " -"functionality in Capture is ongoing and will be added in upcoming app " -"releases." -msgstr "" - -msgid "" -"The core team appreciates any feedback on this new functionality which is " -"currently being beta tested, please report any issues and feedback in the " -"DHIS2 JIRA project." -msgstr "" - -msgid "" -"Click the button below to opt-in to the new enrollment dashboard " -"functionality in the Capture app (beta) for this Tracker program for all " -"users." -msgstr "" - -msgid "Yes, opt in" -msgstr "" - -msgid "Stop using new Enrollment dashboard for {{programName}}" -msgstr "" - -msgid "Opt out for {{programName}}" -msgstr "" - msgid "Enrollment with id \"{{enrollmentId}}\" does not exist" msgstr "" @@ -729,9 +693,6 @@ msgstr "" msgid "Page is missing required values from URL" msgstr "" -msgid "Program is not valid" -msgstr "" - msgid "Org unit is not valid with current program" msgstr "" @@ -1143,6 +1104,9 @@ msgstr "" msgid "Mark incomplete" msgstr "" +msgid "You do not have access to delete this enrollment" +msgstr "" + msgid "Delete enrollment" msgstr "" @@ -1223,6 +1187,12 @@ msgstr "" msgid "Follow-up" msgstr "Segimentu" +msgid "Started at{{escape}}" +msgstr "" + +msgid "Owned by{{escape}}" +msgstr "" + msgid "Cancelled" msgstr "" @@ -1409,11 +1379,6 @@ 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 "" @@ -1495,6 +1460,9 @@ msgstr "" msgid "No changes to display" msgstr "" +msgid "Updated" +msgstr "" + msgid "Created" msgstr "" @@ -1513,6 +1481,9 @@ msgstr "" msgid "Change" msgstr "" +msgid "Value" +msgstr "Valor" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" diff --git a/i18n/tg.po b/i18n/tg.po index 02c2ea6da5..545222c3dc 100644 --- a/i18n/tg.po +++ b/i18n/tg.po @@ -1,14 +1,14 @@ # # Translators: -# Philip Larsen Donnelly, 2024 # Viktor Varland , 2024 +# Philip Larsen Donnelly, 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-09-02T11:08:16.281Z\n" +"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" -"Last-Translator: Viktor Varland , 2024\n" +"Last-Translator: Philip Larsen Donnelly, 2024\n" "Language-Team: Tajik (https://app.transifex.com/hisp-uio/teams/100509/tg/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -607,42 +607,6 @@ msgstr "" msgid "Close the notice" msgstr "" -msgid "Use new Enrollment dashboard for {{programName}}" -msgstr "" - -msgid "Opt in for {{programName}}" -msgstr "" - -msgid "" -"By clicking opt-in below, you will start using the new enrollment dashboard " -"in the Capture app for this Tracker program. At the moment, there is certain" -" functionality from Tracker Capture that has not yet been added, including " -"relationship and referral functionality. The work on including this Tracker " -"functionality in Capture is ongoing and will be added in upcoming app " -"releases." -msgstr "" - -msgid "" -"The core team appreciates any feedback on this new functionality which is " -"currently being beta tested, please report any issues and feedback in the " -"DHIS2 JIRA project." -msgstr "" - -msgid "" -"Click the button below to opt-in to the new enrollment dashboard " -"functionality in the Capture app (beta) for this Tracker program for all " -"users." -msgstr "" - -msgid "Yes, opt in" -msgstr "" - -msgid "Stop using new Enrollment dashboard for {{programName}}" -msgstr "" - -msgid "Opt out for {{programName}}" -msgstr "" - msgid "Enrollment with id \"{{enrollmentId}}\" does not exist" msgstr "" @@ -730,9 +694,6 @@ msgstr "" msgid "Page is missing required values from URL" msgstr "" -msgid "Program is not valid" -msgstr "" - msgid "Org unit is not valid with current program" msgstr "" @@ -1145,6 +1106,9 @@ msgstr "" msgid "Mark incomplete" msgstr "" +msgid "You do not have access to delete this enrollment" +msgstr "" + msgid "Delete enrollment" msgstr "" @@ -1225,6 +1189,12 @@ msgstr "" msgid "Follow-up" msgstr "Пайгирӣ кардан" +msgid "Started at{{escape}}" +msgstr "" + +msgid "Owned by{{escape}}" +msgstr "" + msgid "Cancelled" msgstr "" @@ -1413,11 +1383,6 @@ 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 "" @@ -1500,6 +1465,9 @@ msgstr "" msgid "No changes to display" msgstr "" +msgid "Updated" +msgstr "" + msgid "Created" msgstr "" @@ -1518,6 +1486,9 @@ msgstr "" msgid "Change" msgstr "" +msgid "Value" +msgstr "Қимат" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" diff --git a/i18n/uk.po b/i18n/uk.po index b294680692..0506bb74f1 100644 --- a/i18n/uk.po +++ b/i18n/uk.po @@ -1,17 +1,17 @@ # # Translators: -# Philip Larsen Donnelly, 2023 # Wanda , 2024 # Éva Tamási, 2024 # Nadiia , 2024 # Viktor Varland , 2024 +# Philip Larsen Donnelly, 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-09-02T11:08:16.281Z\n" +"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" -"Last-Translator: Viktor Varland , 2024\n" +"Last-Translator: Philip Larsen Donnelly, 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" @@ -612,42 +612,6 @@ msgstr "" msgid "Close the notice" msgstr "" -msgid "Use new Enrollment dashboard for {{programName}}" -msgstr "" - -msgid "Opt in for {{programName}}" -msgstr "" - -msgid "" -"By clicking opt-in below, you will start using the new enrollment dashboard " -"in the Capture app for this Tracker program. At the moment, there is certain" -" functionality from Tracker Capture that has not yet been added, including " -"relationship and referral functionality. The work on including this Tracker " -"functionality in Capture is ongoing and will be added in upcoming app " -"releases." -msgstr "" - -msgid "" -"The core team appreciates any feedback on this new functionality which is " -"currently being beta tested, please report any issues and feedback in the " -"DHIS2 JIRA project." -msgstr "" - -msgid "" -"Click the button below to opt-in to the new enrollment dashboard " -"functionality in the Capture app (beta) for this Tracker program for all " -"users." -msgstr "" - -msgid "Yes, opt in" -msgstr "" - -msgid "Stop using new Enrollment dashboard for {{programName}}" -msgstr "" - -msgid "Opt out for {{programName}}" -msgstr "" - msgid "Enrollment with id \"{{enrollmentId}}\" does not exist" msgstr "" @@ -735,9 +699,6 @@ msgstr "" msgid "Page is missing required values from URL" msgstr "" -msgid "Program is not valid" -msgstr "" - msgid "Org unit is not valid with current program" msgstr "" @@ -1152,6 +1113,9 @@ msgstr "" msgid "Mark incomplete" msgstr "" +msgid "You do not have access to delete this enrollment" +msgstr "" + msgid "Delete enrollment" msgstr "Видалити реєстрацію" @@ -1232,6 +1196,12 @@ msgstr "" msgid "Follow-up" msgstr "Подальші дії" +msgid "Started at{{escape}}" +msgstr "" + +msgid "Owned by{{escape}}" +msgstr "" + msgid "Cancelled" msgstr "Скасовано" @@ -1424,11 +1394,6 @@ 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 "" @@ -1513,6 +1478,9 @@ msgstr "" msgid "No changes to display" msgstr "" +msgid "Updated" +msgstr "" + msgid "Created" msgstr "Створено" @@ -1531,6 +1499,9 @@ msgstr "Елемент даних" msgid "Change" msgstr "" +msgid "Value" +msgstr "Значення" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" diff --git a/i18n/ur.po b/i18n/ur.po index 9a1900631a..a955c4e3e1 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-09-02T11:08:16.281Z\n" +"POT-Creation-Date: 2024-10-25T18:18:11.518Z\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" @@ -607,42 +607,6 @@ msgstr "" msgid "Close the notice" msgstr "" -msgid "Use new Enrollment dashboard for {{programName}}" -msgstr "" - -msgid "Opt in for {{programName}}" -msgstr "" - -msgid "" -"By clicking opt-in below, you will start using the new enrollment dashboard " -"in the Capture app for this Tracker program. At the moment, there is certain" -" functionality from Tracker Capture that has not yet been added, including " -"relationship and referral functionality. The work on including this Tracker " -"functionality in Capture is ongoing and will be added in upcoming app " -"releases." -msgstr "" - -msgid "" -"The core team appreciates any feedback on this new functionality which is " -"currently being beta tested, please report any issues and feedback in the " -"DHIS2 JIRA project." -msgstr "" - -msgid "" -"Click the button below to opt-in to the new enrollment dashboard " -"functionality in the Capture app (beta) for this Tracker program for all " -"users." -msgstr "" - -msgid "Yes, opt in" -msgstr "" - -msgid "Stop using new Enrollment dashboard for {{programName}}" -msgstr "" - -msgid "Opt out for {{programName}}" -msgstr "" - msgid "Enrollment with id \"{{enrollmentId}}\" does not exist" msgstr "" @@ -730,9 +694,6 @@ msgstr "" msgid "Page is missing required values from URL" msgstr "" -msgid "Program is not valid" -msgstr "" - msgid "Org unit is not valid with current program" msgstr "" @@ -1145,6 +1106,9 @@ msgstr "" msgid "Mark incomplete" msgstr "" +msgid "You do not have access to delete this enrollment" +msgstr "" + msgid "Delete enrollment" msgstr "اندراج حذف کریں" @@ -1225,6 +1189,12 @@ msgstr "" msgid "Follow-up" msgstr "" +msgid "Started at{{escape}}" +msgstr "" + +msgid "Owned by{{escape}}" +msgstr "" + msgid "Cancelled" msgstr "منسوخ" @@ -1413,11 +1383,6 @@ 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 "" @@ -1500,6 +1465,9 @@ msgstr "" msgid "No changes to display" msgstr "" +msgid "Updated" +msgstr "" + msgid "Created" msgstr "تخلیق" @@ -1518,6 +1486,9 @@ msgstr "" msgid "Change" msgstr "" +msgid "Value" +msgstr "قدر" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" diff --git a/i18n/uz_UZ_Cyrl.po b/i18n/uz_UZ_Cyrl.po index 6ad437c602..a397b0df49 100644 --- a/i18n/uz_UZ_Cyrl.po +++ b/i18n/uz_UZ_Cyrl.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-09-02T11:08:16.281Z\n" +"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Khurshid Ibatov , 2024\n" "Language-Team: Uzbek (Cyrillic) (https://app.transifex.com/hisp-uio/teams/100509/uz@Cyrl/)\n" @@ -624,42 +624,6 @@ msgstr "" msgid "Close the notice" msgstr "" -msgid "Use new Enrollment dashboard for {{programName}}" -msgstr "" - -msgid "Opt in for {{programName}}" -msgstr "" - -msgid "" -"By clicking opt-in below, you will start using the new enrollment dashboard " -"in the Capture app for this Tracker program. At the moment, there is certain" -" functionality from Tracker Capture that has not yet been added, including " -"relationship and referral functionality. The work on including this Tracker " -"functionality in Capture is ongoing and will be added in upcoming app " -"releases." -msgstr "" - -msgid "" -"The core team appreciates any feedback on this new functionality which is " -"currently being beta tested, please report any issues and feedback in the " -"DHIS2 JIRA project." -msgstr "" - -msgid "" -"Click the button below to opt-in to the new enrollment dashboard " -"functionality in the Capture app (beta) for this Tracker program for all " -"users." -msgstr "" - -msgid "Yes, opt in" -msgstr "" - -msgid "Stop using new Enrollment dashboard for {{programName}}" -msgstr "" - -msgid "Opt out for {{programName}}" -msgstr "" - msgid "Enrollment with id \"{{enrollmentId}}\" does not exist" msgstr "\"{{enrollmentId}}\" идентификатори билан қайд қилиш имконсиз" @@ -754,9 +718,6 @@ msgstr "Ушбу дастурдаги ишчи рўйхатни кўриб чи msgid "Page is missing required values from URL" msgstr "URL саҳифасида керакли қийматлар йўқ" -msgid "Program is not valid" -msgstr "Дастур яроқли эмас" - msgid "Org unit is not valid with current program" msgstr "Жорий дастур учун ташкилий бирлик яроқли эмас" @@ -1178,6 +1139,9 @@ msgstr "" msgid "Mark incomplete" msgstr "Тугалланмаган деб белгилансин" +msgid "You do not have access to delete this enrollment" +msgstr "" + msgid "Delete enrollment" msgstr "Рўйхатдан ўтказиш ўчирилсин " @@ -1259,6 +1223,12 @@ msgstr "" msgid "Follow-up" msgstr "Кузатиш" +msgid "Started at{{escape}}" +msgstr "" + +msgid "Owned by{{escape}}" +msgstr "" + msgid "Cancelled" msgstr "Бекор қилинди" @@ -1446,11 +1416,6 @@ 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 "" @@ -1532,6 +1497,9 @@ msgstr "" msgid "No changes to display" msgstr "" +msgid "Updated" +msgstr "Янгиланди" + msgid "Created" msgstr "Яратилган" @@ -1550,6 +1518,9 @@ msgstr "Маълумот элементи" msgid "Change" msgstr "" +msgid "Value" +msgstr "Қиймат" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" diff --git a/i18n/uz_UZ_Latn.po b/i18n/uz_UZ_Latn.po index 720b8be8e6..cbb6637b95 100644 --- a/i18n/uz_UZ_Latn.po +++ b/i18n/uz_UZ_Latn.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-09-02T11:08:16.281Z\n" +"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Yury Rogachev , 2024\n" "Language-Team: Uzbek (Latin) (https://app.transifex.com/hisp-uio/teams/100509/uz@Latn/)\n" @@ -625,42 +625,6 @@ msgstr "" msgid "Close the notice" msgstr "" -msgid "Use new Enrollment dashboard for {{programName}}" -msgstr "" - -msgid "Opt in for {{programName}}" -msgstr "" - -msgid "" -"By clicking opt-in below, you will start using the new enrollment dashboard " -"in the Capture app for this Tracker program. At the moment, there is certain" -" functionality from Tracker Capture that has not yet been added, including " -"relationship and referral functionality. The work on including this Tracker " -"functionality in Capture is ongoing and will be added in upcoming app " -"releases." -msgstr "" - -msgid "" -"The core team appreciates any feedback on this new functionality which is " -"currently being beta tested, please report any issues and feedback in the " -"DHIS2 JIRA project." -msgstr "" - -msgid "" -"Click the button below to opt-in to the new enrollment dashboard " -"functionality in the Capture app (beta) for this Tracker program for all " -"users." -msgstr "" - -msgid "Yes, opt in" -msgstr "" - -msgid "Stop using new Enrollment dashboard for {{programName}}" -msgstr "" - -msgid "Opt out for {{programName}}" -msgstr "" - msgid "Enrollment with id \"{{enrollmentId}}\" does not exist" msgstr "" @@ -748,9 +712,6 @@ msgstr "" msgid "Page is missing required values from URL" msgstr "" -msgid "Program is not valid" -msgstr "" - msgid "Org unit is not valid with current program" msgstr "" @@ -1169,6 +1130,9 @@ msgstr "" msgid "Mark incomplete" msgstr "" +msgid "You do not have access to delete this enrollment" +msgstr "" + msgid "Delete enrollment" msgstr "Roʼyxatdan oʼtkazish oʼchirilsin" @@ -1249,6 +1213,12 @@ msgstr "" msgid "Follow-up" msgstr "Kuzatish" +msgid "Started at{{escape}}" +msgstr "" + +msgid "Owned by{{escape}}" +msgstr "" + msgid "Cancelled" msgstr "Bekor qilindi" @@ -1435,11 +1405,6 @@ 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 "" @@ -1521,6 +1486,9 @@ msgstr "" msgid "No changes to display" msgstr "" +msgid "Updated" +msgstr "Yangilandi" + msgid "Created" msgstr "Yaratilgan" @@ -1539,6 +1507,9 @@ msgstr "Maʼlumot elementi" msgid "Change" msgstr "" +msgid "Value" +msgstr "Қиймат" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" diff --git a/i18n/vi.po b/i18n/vi.po index 4599936038..5ca15df651 100644 --- a/i18n/vi.po +++ b/i18n/vi.po @@ -1,14 +1,14 @@ # # Translators: -# Philip Larsen Donnelly, 2024 # Mai Nguyen , 2024 # Viktor Varland , 2024 +# Philip Larsen Donnelly, 2024 # Thuy Nguyen , 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-09-02T11:08:16.281Z\n" +"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Thuy Nguyen , 2024\n" "Language-Team: Vietnamese (https://app.transifex.com/hisp-uio/teams/100509/vi/)\n" @@ -622,42 +622,6 @@ msgstr "" msgid "Close the notice" msgstr "" -msgid "Use new Enrollment dashboard for {{programName}}" -msgstr "" - -msgid "Opt in for {{programName}}" -msgstr "" - -msgid "" -"By clicking opt-in below, you will start using the new enrollment dashboard " -"in the Capture app for this Tracker program. At the moment, there is certain" -" functionality from Tracker Capture that has not yet been added, including " -"relationship and referral functionality. The work on including this Tracker " -"functionality in Capture is ongoing and will be added in upcoming app " -"releases." -msgstr "" - -msgid "" -"The core team appreciates any feedback on this new functionality which is " -"currently being beta tested, please report any issues and feedback in the " -"DHIS2 JIRA project." -msgstr "" - -msgid "" -"Click the button below to opt-in to the new enrollment dashboard " -"functionality in the Capture app (beta) for this Tracker program for all " -"users." -msgstr "" - -msgid "Yes, opt in" -msgstr "" - -msgid "Stop using new Enrollment dashboard for {{programName}}" -msgstr "" - -msgid "Opt out for {{programName}}" -msgstr "" - msgid "Enrollment with id \"{{enrollmentId}}\" does not exist" msgstr "" @@ -745,9 +709,6 @@ msgstr "" msgid "Page is missing required values from URL" msgstr "" -msgid "Program is not valid" -msgstr "" - msgid "Org unit is not valid with current program" msgstr "" @@ -770,7 +731,7 @@ msgid "Schedule" msgstr "Lịch biểu" msgid "Refer" -msgstr "" +msgstr "Tham chiếu" msgid "You can't add any more {{ programStageName }} events" msgstr "" @@ -1167,6 +1128,9 @@ msgstr "" msgid "Mark incomplete" msgstr "" +msgid "You do not have access to delete this enrollment" +msgstr "" + msgid "Delete enrollment" msgstr "Xóa đăng ký" @@ -1247,6 +1211,12 @@ msgstr "" msgid "Follow-up" msgstr "Theo dõi sau" +msgid "Started at{{escape}}" +msgstr "" + +msgid "Owned by{{escape}}" +msgstr "" + msgid "Cancelled" msgstr "Đã hủy" @@ -1433,11 +1403,6 @@ 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 "" @@ -1519,6 +1484,9 @@ msgstr "" msgid "No changes to display" msgstr "" +msgid "Updated" +msgstr "" + msgid "Created" msgstr "Đã tạo" @@ -1537,6 +1505,9 @@ msgstr "Mục dữ liệu" msgid "Change" msgstr "" +msgid "Value" +msgstr "Giá trị" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" diff --git a/i18n/zh_CN.po b/i18n/zh_CN.po index 3f3a8e6b43..8d01178792 100644 --- a/i18n/zh_CN.po +++ b/i18n/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-10-14T14:53:34.553Z\n" +"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: 晓东 林 <13981924470@126.com>, 2024\n" "Language-Team: Chinese (China) (https://app.transifex.com/hisp-uio/teams/100509/zh_CN/)\n" @@ -697,9 +697,6 @@ msgstr "查看此项目中的工作清单。" msgid "Page is missing required values from URL" msgstr "页面缺少 URL 中的必需值" -msgid "Program is not valid" -msgstr "项目无效" - msgid "Org unit is not valid with current program" msgstr "机构对当前项目无效" @@ -1113,6 +1110,9 @@ msgstr "标记为已取消" msgid "Mark incomplete" msgstr "标记不完整" +msgid "You do not have access to delete this enrollment" +msgstr "" + msgid "Delete enrollment" msgstr "删除报名" @@ -1193,6 +1193,12 @@ msgstr "无法加载报名的小部件。请稍后再试" msgid "Follow-up" msgstr "后续" +msgid "Started at{{escape}}" +msgstr "" + +msgid "Owned by{{escape}}" +msgstr "" + msgid "Cancelled" msgstr "已取消" @@ -1379,11 +1385,6 @@ 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 "" @@ -1465,6 +1466,9 @@ msgstr "" msgid "No changes to display" msgstr "" +msgid "Updated" +msgstr "更新的" + msgid "Created" msgstr "已创建" @@ -1483,6 +1487,9 @@ msgstr "" msgid "Change" msgstr "" +msgid "Value" +msgstr "值" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" From 2bbea47eb519b6c91a7c76c10bf817e26f35ca41 Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Sun, 3 Nov 2024 01:49:02 +0000 Subject: [PATCH 12/14] chore(release): cut 101.14.6 [skip release] ## [101.14.6](https://github.com/dhis2/capture-app/compare/v101.14.5...v101.14.6) (2024-11-03) ### Bug Fixes * **translations:** sync translations from transifex (master) ([facbee1](https://github.com/dhis2/capture-app/commit/facbee13d009d11e955a1a9b277e27ba41b63867)) --- CHANGELOG.md | 7 +++++++ package.json | 4 ++-- packages/rules-engine/package.json | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8136f020c9..6c192352e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [101.14.6](https://github.com/dhis2/capture-app/compare/v101.14.5...v101.14.6) (2024-11-03) + + +### Bug Fixes + +* **translations:** sync translations from transifex (master) ([facbee1](https://github.com/dhis2/capture-app/commit/facbee13d009d11e955a1a9b277e27ba41b63867)) + ## [101.14.5](https://github.com/dhis2/capture-app/compare/v101.14.4...v101.14.5) (2024-11-01) diff --git a/package.json b/package.json index c0edde4cd1..59fa6c912d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "capture-app", "homepage": ".", - "version": "101.14.5", + "version": "101.14.6", "cacheVersion": "7", "serverVersion": "38", "license": "BSD-3-Clause", @@ -10,7 +10,7 @@ "packages/rules-engine" ], "dependencies": { - "@dhis2/rules-engine-javascript": "101.14.5", + "@dhis2/rules-engine-javascript": "101.14.6", "@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 459d5ca235..dcd47d7c56 100644 --- a/packages/rules-engine/package.json +++ b/packages/rules-engine/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/rules-engine-javascript", - "version": "101.14.5", + "version": "101.14.6", "license": "BSD-3-Clause", "main": "./build/cjs/index.js", "scripts": { From 1d9ae5731331d3f19a0980cf09ebdd9cc46e4583 Mon Sep 17 00:00:00 2001 From: henrikmv <110386561+henrikmv@users.noreply.github.com> Date: Mon, 4 Nov 2024 09:22:37 +0100 Subject: [PATCH 13/14] fix: [DHIS2-17135][DHIS2-17018] Adjust strings for error messages (#3858) * fix: string adjustment * fix: disable button and add tooltip * Revert "fix: disable button and add tooltip" This reverts commit 8cfb4a655a45420f714d4c12d5d91ce4a90475c9. * fix: string improvement for record access error * fix: string improvement * fix: merge conflict * fix: merge conflict --- i18n/en.pot | 16 ++++++++++------ .../Pages/Enrollment/MissingMessage.component.js | 2 +- .../WidgetAssignee/DisplayMode.component.js | 4 ++-- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/i18n/en.pot b/i18n/en.pot index 5fb403e3d7..370523a4b2 100644 --- a/i18n/en.pot +++ b/i18n/en.pot @@ -674,8 +674,12 @@ msgstr "There are no active enrollments." msgid "Add new enrollment for {{teiDisplayName}} in this program." msgstr "Add new enrollment for {{teiDisplayName}} in this program." -msgid "No access to program owner." -msgstr "No access to program owner." +msgid "" +"You do not have permissions to access to this program, registering unit or " +"record, contact your administrator for more information." +msgstr "" +"You do not have permissions to access to this program, registering unit or " +"record, contact your administrator for more information." msgid "{{teiDisplayName}} is not enrolled in this program." msgstr "{{teiDisplayName}} is not enrolled in this program." @@ -1074,8 +1078,8 @@ msgstr "No tracked entity types available" msgid "Assigned to" msgstr "Assigned to" -msgid "You don't have access to edit this assignee" -msgstr "You don't have access to edit this assignee" +msgid "You don't have access to edit the assigned user" +msgstr "You don't have access to edit the assigned user" msgid "Edit" msgstr "Edit" @@ -1083,8 +1087,8 @@ msgstr "Edit" msgid "No one is assigned to this event" msgstr "No one is assigned to this event" -msgid "You don't have access to assign an assignee" -msgstr "You don't have access to assign an assignee" +msgid "You don't have access to assign a user to this event" +msgstr "You don't have access to assign a user to this event" msgid "Assign" msgstr "Assign" diff --git a/src/core_modules/capture-core/components/Pages/Enrollment/MissingMessage.component.js b/src/core_modules/capture-core/components/Pages/Enrollment/MissingMessage.component.js index 17d36faedd..e46f36adb9 100644 --- a/src/core_modules/capture-core/components/Pages/Enrollment/MissingMessage.component.js +++ b/src/core_modules/capture-core/components/Pages/Enrollment/MissingMessage.component.js @@ -194,7 +194,7 @@ export const MissingMessage = withStyles(getStyles)(({ { missingStatus === missingStatuses.RESTRICTED_PROGRAM_NO_ACCESS && - {i18n.t('No access to program owner.')} + {i18n.t('You do not have permissions to access to this program, registering unit or record, contact your administrator for more information.')} } diff --git a/src/core_modules/capture-core/components/WidgetAssignee/DisplayMode.component.js b/src/core_modules/capture-core/components/WidgetAssignee/DisplayMode.component.js index e0b2ebb2dd..8f49833590 100644 --- a/src/core_modules/capture-core/components/WidgetAssignee/DisplayMode.component.js +++ b/src/core_modules/capture-core/components/WidgetAssignee/DisplayMode.component.js @@ -44,7 +44,7 @@ const DisplayModePlain = ({ assignee, onEdit, writeAccess, avatarId, classes }: {assignee.name}