Merge remote-tracking branch 'origin/master' into eh/fix/DHIS2-15694_…

…CancelButtonInRelationship

# Conflicts:
#	src/core_modules/capture-core/components/Pages/common/TEIRelationshipsWidget/RegisterTei/DataEntry/TrackedEntityInstance/DataEntryTrackedEntityInstance.js
#	src/core_modules/capture-core/components/Pages/common/TEIRelationshipsWidget/RegisterTei/RegisterTei.container.js

CHANGELOG.md

@@ -1,3 +1,64 @@
+# [100.47.0](https://github.com/dhis2/capture-app/compare/v100.46.1...v100.47.0) (2023-12-03)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([e20fb8c](https://github.com/dhis2/capture-app/commit/e20fb8c551aefb0546c5973dd87940d56e3018be))
+
+
+### Features
+
+* [DHIS2-16123] Add inheritable TEAs to Relationships ([#3464](https://github.com/dhis2/capture-app/issues/3464)) ([620b008](https://github.com/dhis2/capture-app/commit/620b00832da7c4951d6e905b40317dd0acca0aa6))
+
+## [100.46.1](https://github.com/dhis2/capture-app/compare/v100.46.0...v100.46.1) (2023-11-30)
+
+
+### Bug Fixes
+
+* [DHIS2-15686] fix program rule variables for edit profile mode ([#3463](https://github.com/dhis2/capture-app/issues/3463)) ([a24bb27](https://github.com/dhis2/capture-app/commit/a24bb2723f06cd4a3ca87bbbb22977b097377b3c))
+
+# [100.46.0](https://github.com/dhis2/capture-app/compare/v100.45.2...v100.46.0) (2023-11-30)
+
+
+### Features
+
+* [DHIS2-14275] Support custom icons ([#3473](https://github.com/dhis2/capture-app/issues/3473)) ([2404fca](https://github.com/dhis2/capture-app/commit/2404fca8085965e699ae518cfe816f2f3d38dea7))
+
+## [100.45.2](https://github.com/dhis2/capture-app/compare/v100.45.1...v100.45.2) (2023-11-29)
+
+
+### Bug Fixes
+
+* [DHIS2-15693] Rules not triggered on program update ([#3472](https://github.com/dhis2/capture-app/issues/3472)) ([2dbca1e](https://github.com/dhis2/capture-app/commit/2dbca1efe36ed0e166d4aea803505c30c79cb35d))
+
+## [100.45.1](https://github.com/dhis2/capture-app/compare/v100.45.0...v100.45.1) (2023-11-26)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([8f28703](https://github.com/dhis2/capture-app/commit/8f28703ae8b56cfee283ec1ce0ec2b13dfd91e30))
+
+# [100.45.0](https://github.com/dhis2/capture-app/compare/v100.44.7...v100.45.0) (2023-11-20)
+
+
+### Features
+
+* [DHIS2-13237] Enrollment coordinates in enrollment widget ([#3141](https://github.com/dhis2/capture-app/issues/3141)) ([2f2e52c](https://github.com/dhis2/capture-app/commit/2f2e52c3103e9cb48e77766701a9a5fc9af6ad48))
+
+## [100.44.7](https://github.com/dhis2/capture-app/compare/v100.44.6...v100.44.7) (2023-11-19)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([46fb227](https://github.com/dhis2/capture-app/commit/46fb2270b21c4dec57f4447232608d8dd3cfb9af))
+
+## [100.44.6](https://github.com/dhis2/capture-app/compare/v100.44.5...v100.44.6) (2023-11-16)
+
+
+### Bug Fixes
+
+* [DHIS2-15967] allow enrolling TEIs with mandatory TET attributes ([#3455](https://github.com/dhis2/capture-app/issues/3455)) ([cc87a8a](https://github.com/dhis2/capture-app/commit/cc87a8a993001d5b4cea8493a84a6798f481cc5a))
+
 ## [100.44.5](https://github.com/dhis2/capture-app/compare/v100.44.4...v100.44.5) (2023-11-10)
 
 

cypress/e2e/MainPage.feature

@@ -42,3 +42,15 @@ Feature: User interacts with Main page
         Then you see the opt out component for Child Programme
         When you opt out to use the new enrollment Dashboard for Child Programme
         Then you see the opt in component for Child Programme
+
+    @v<41
+    Scenario: The icon is rendered as an svg
+        Given you are in the main page with no selections made
+        When you select Child Programme
+        Then the icon is rendered as an svg
+
+    @v>=41
+    Scenario: The icon is rendered as a custom icon
+        Given you are in the main page with no selections made
+        When you select Child Programme
+        Then the icon is rendered as a custom icon

cypress/e2e/MainPage/index.js

@@ -20,6 +20,18 @@ And('you can load the view with the name Events assigned to me', () => {
         });
 });
 
+Then('the icon is rendered as a custom icon', () => {
+    cy.get('[alt="child_program_positive"]')
+        .invoke('attr', 'src')
+        .should('match', /\/icons\/child_program_positive\/icon$/);
+});
+
+Then('the icon is rendered as an svg', () => {
+    cy.get('[alt="child_program_positive"]')
+        .invoke('attr', 'src')
+        .should('match', /\/icons\/child_program_positive\/icon.svg$/);
+});
+
 Then('the TEI working list is displayed', () => {
     cy.get('[data-test="tei-working-lists"]').within(() => {
         cy.contains('Rows per page').should('exist');

i18n/ar.po

@@ -1,16 +1,16 @@
 # 
 # Translators:
 # KRG HIS <[email protected]>, 2020
-# Viktor Varland <[email protected]>, 2023
-# Hamza Assada <[email protected]>, 2023
 # Philip Larsen Donnelly, 2023
+# Hamza Assada <[email protected]>, 2023
+# Viktor Varland <[email protected]>, 2023
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
 "POT-Creation-Date: 2023-09-12T06:24:49.265Z\n"
 "PO-Revision-Date: 2019-06-27 07:31+0000\n"
-"Last-Translator: Philip Larsen Donnelly, 2023\n"
+"Last-Translator: Viktor Varland <[email protected]>, 2023\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"
@@ -533,6 +533,9 @@ msgstr "ابدأ الكتابة للبحث"
 msgid "suggestions could not be retrieved"
 msgstr "تعذر استرداد الاقتراحات"
 
+msgid "No results found"
+msgstr "لم يتم العثور على أي نتائج"
+
 msgid "No items to display"
 msgstr "لا توجد عناصر للعرض"
 
@@ -951,9 +954,6 @@ msgstr ""
 msgid "Possible duplicates found"
 msgstr "إحتمال وجود تكرار"
 
-msgid "No results found"
-msgstr "لم يتم العثور على أي نتائج"
-
 msgid "An error occurred loading possible duplicates"
 msgstr ""
 
@@ -1154,6 +1154,33 @@ msgstr "اشر من أجل الملحق"
 msgid "Existing dates for auto-generated events will not be updated."
 msgstr ""
 
+msgid "Latitude"
+msgstr "خط العرض"
+
+msgid "Longitude"
+msgstr "خط الطول"
+
+msgid "Edit"
+msgstr "تعديل"
+
+msgid "Set coordinates"
+msgstr ""
+
+msgid "Coordinates"
+msgstr "الإحداثيات"
+
+msgid "Delete polygon"
+msgstr "حذف المضلع"
+
+msgid "Close without saving"
+msgstr ""
+
+msgid "Finish drawing before saving"
+msgstr ""
+
+msgid "Set area"
+msgstr "عين المساحة"
+
 msgid "Enrollment date"
 msgstr "تاريخ التسجيل"
 
@@ -1178,6 +1205,12 @@ msgstr ""
 msgid "Cancelled"
 msgstr "الملغية"
 
+msgid "Add coordinates"
+msgstr ""
+
+msgid "Add area"
+msgstr ""
+
 msgid "Comments about this enrollment"
 msgstr ""
 
@@ -1300,9 +1333,6 @@ msgstr ""
 msgid "{{TETName}} profile"
 msgstr ""
 
-msgid "Edit"
-msgstr "تعديل"
-
 msgid "tracked entity instance"
 msgstr "نموذج الكيان المتتبع"
 
@@ -1368,7 +1398,7 @@ msgid "To open this relationship, please wait until saving is complete"
 msgstr ""
 
 msgid "Type"
-msgstr ""
+msgstr "النوع"
 
 msgid "Created date"
 msgstr ""
@@ -1550,12 +1580,6 @@ msgstr "إلى وقت"
 msgid "Page {{currentPage}}"
 msgstr "صفحة {{currentPage}}"
 
-msgid "Delete polygon"
-msgstr "حذف المضلع"
-
-msgid "Set area"
-msgstr "عين المساحة"
-
 msgid "Area on map saved"
 msgstr ""