Merge branch 'DHIS2-13237' into DHIS2-6335

.tx/config

@@ -1,6 +1,6 @@
 [main]
 host     = https://www.transifex.com
-lang_map = fa_AF: prs, uz@Cyrl: uz, uz@Latn: uz_Latn
+lang_map = fa_AF: prs, uz@Cyrl: uz_UZ_Cyrl, uz@Latn: uz_UZ_Latn
 
 [o:hisp-uio:p:app-capture-app:r:en-pot]
 file_filter  = i18n/<lang>.po

CHANGELOG.md

@@ -1,3 +1,31 @@
+## [100.39.3](https://github.com/dhis2/capture-app/compare/v100.39.2...v100.39.3) (2023-09-14)
+
+
+### Bug Fixes
+
+* [DHIS2-15356] change tei search parameter from `ou` to `orgUnit` ([#3362](https://github.com/dhis2/capture-app/issues/3362)) ([c7ab828](https://github.com/dhis2/capture-app/commit/c7ab82826254be24959ff25d643b68c1e525c893))
+
+## [100.39.2](https://github.com/dhis2/capture-app/compare/v100.39.1...v100.39.2) (2023-09-14)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([c17c663](https://github.com/dhis2/capture-app/commit/c17c6637f0e6ce93bdd5f5ef3d534d3ac9206c86))
+
+## [100.39.1](https://github.com/dhis2/capture-app/compare/v100.39.0...v100.39.1) (2023-09-13)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([0fab0eb](https://github.com/dhis2/capture-app/commit/0fab0eba7b63cbfd080990913313fc6b6ff2d38f))
+
+# [100.39.0](https://github.com/dhis2/capture-app/compare/v100.38.0...v100.39.0) (2023-09-07)
+
+
+### Features
+
+* [DHIS2-13343] hidden program stage rule effect ([#3406](https://github.com/dhis2/capture-app/issues/3406)) ([4ef2973](https://github.com/dhis2/capture-app/commit/4ef2973b71d6376f99db07e70bc4d51facb8018e))
+
 # [100.38.0](https://github.com/dhis2/capture-app/compare/v100.37.0...v100.38.0) (2023-09-06)
 
 

cypress/integration/WorkingLists/TeiWorkingLists/TeiWorkingListsUser.feature

@@ -159,9 +159,9 @@ And you apply the current filter
 When you click the last name column header
 Then the sort arrow should indicate ascending order
 And the list should display data ordered ascendingly by last name
-When you click the WHOMCH Smoking column header
+When you click the WHOMCH Hemoglobin value column header
 Then the sort arrow should indicate descending order
-And the list should display data ordered ascendingly by WHOMCH Smoking
+And the list should display data ordered descending by WHOMCH Hemoglobin
 
 @v>=39
 Scenario: The user can remove the program stage filter

cypress/integration/WorkingLists/TeiWorkingLists/TeiWorkingListsUser/index.js

@@ -343,9 +343,9 @@ When('you click the last name column header', () => {
         .click();
 });
 
-When('you click the WHOMCH Smoking column header', () => {
+When('you click the WHOMCH Hemoglobin value column header', () => {
     cy.get('[data-test="dhis2-uicore-tableheadercellaction"]')
-        .eq(6)
+        .last()
         .click()
         .click();
 });
@@ -400,10 +400,10 @@ Then('the list should display data ordered ascendingly by last name', () => {
         });
 });
 
-Then('the list should display data ordered ascendingly by WHOMCH Smoking', () => {
+Then('the list should display data ordered descending by WHOMCH Hemoglobin', () => {
     const names = [
-        'Siren',
         'Hertz',
+        'Siren',
     ];
 
     cy.get('[data-test="tei-working-lists"]')

i18n/ar.po

@@ -1,14 +1,14 @@
 # 
 # Translators:
 # KRG HIS <[email protected]>, 2020
-# phil_dhis2, 2022
+# Philip Larsen Donnelly, 2022
 # Viktor Varland <[email protected]>, 2023
 # Hamza Assada <[email protected]>, 2023
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2023-06-27T06:20:33.460Z\n"
+"POT-Creation-Date: 2023-09-04T07:07:59.195Z\n"
 "PO-Revision-Date: 2019-06-27 07:31+0000\n"
 "Last-Translator: Hamza Assada <[email protected]>, 2023\n"
 "Language-Team: Arabic (https://app.transifex.com/hisp-uio/teams/100509/ar/)\n"
@@ -75,6 +75,16 @@ msgstr "تاريخ التسجيل"
 msgid "Last updated"
 msgstr "آخر تحديث"
 
+msgid "error encountered during field validation"
+msgstr "حدث خطأ أثناء التحقق من صحة الحقل"
+
+msgid "error"
+msgstr "خطأ"
+
+msgid ""
+"Plugins are not yet available - Please contact your system administrator"
+msgstr ""
+
 msgid "This value is validating"
 msgstr "يتم التحقق من القيمة"
 
@@ -368,9 +378,6 @@ msgstr "لا تزال بعض العمليات قيد التشغيل. يرجى ا
 msgid "Operations running"
 msgstr "العمليات الجارية"
 
-msgid "Sort"
-msgstr "فرز"
-
 msgid ""
 "This event has unsaved changes. Leaving this page without saving will lose "
 "these changes. Are you sure you want to discard unsaved changes?"
@@ -755,7 +762,7 @@ msgstr "المجدولة زمنياً"
 msgid "Refer"
 msgstr ""
 
-msgid "You can’t add any more {{ programStageName }} events"
+msgid "You can't add any more {{ programStageName }} events"
 msgstr ""
 
 msgid "Cancel without saving"
@@ -819,6 +826,9 @@ msgstr ""
 msgid "New Enrollment in program{{escape}} {{programName}}"
 msgstr ""
 
+msgid "Save {{trackedEntityTypeName}}"
+msgstr ""
+
 msgid "Save {{trackedEntityName}}"
 msgstr ""
 
@@ -972,15 +982,6 @@ msgstr "يمكنك أيضًا اختيار برنامج من الشريط الع
 msgid "Choose a type to start searching"
 msgstr "اختر نوعًا لبدء البحث"
 
-msgid "Fill in at least {{count}} attribute to search"
-msgid_plural "Fill in at least {{count}} attribute to search"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-
 msgid "Search {{name}}"
 msgstr "البحث عن {{name}}"
 
@@ -1135,6 +1136,9 @@ msgstr ""
 msgid "Mark for follow-up"
 msgstr "اشر من أجل الملحق"
 
+msgid "Existing dates for auto-generated events will not be updated."
+msgstr ""
+
 msgid "Enrollment date"
 msgstr "تاريخ التسجيل"
 
@@ -1223,32 +1227,12 @@ msgid ""
 "The scheduled date matches the suggested date, but can be changed if needed."
 msgstr ""
 
-msgid "The scheduled date is {{count}} days {{position}} the suggested date."
-msgid_plural ""
-"The scheduled date is {{count}} days {{position}} the suggested date."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-
 msgid "after"
 msgstr "بعد"
 
 msgid "before"
 msgstr "قبل"
 
-msgid "There are {{count}} scheduled event in {{orgUnitName}} on this day."
-msgid_plural ""
-"There are {{count}} scheduled event in {{orgUnitName}} on this day."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-
 msgid ""
 "Scheduling an event in {{stageName}} for {{programName}} in {{orgUnitName}}"
 msgstr ""
@@ -1496,9 +1480,6 @@ msgstr ""
 msgid "Set coordinate"
 msgstr "ضبط الإحداثية"
 
-msgid "Page {{currentPage}}"
-msgstr "صفحة {{currentPage}}"
-
 msgid "Date"
 msgstr "التاريخ"
 
@@ -1517,11 +1498,8 @@ msgstr "حتى تاريخ"
 msgid "To time"
 msgstr "إلى وقت"
 
-msgid "error encountered during field validation"
-msgstr "حدث خطأ أثناء التحقق من صحة الحقل"
-
-msgid "error"
-msgstr "خطأ"
+msgid "Page {{currentPage}}"
+msgstr "صفحة {{currentPage}}"
 
 msgid "Delete polygon"
 msgstr "حذف المضلع"

i18n/ar_IQ.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2023-06-27T06:20:33.460Z\n"
+"POT-Creation-Date: 2023-09-04T07:07:59.195Z\n"
 "PO-Revision-Date: 2019-06-27 07:31+0000\n"
 "Last-Translator: KRG HIS <[email protected]>, 2022\n"
 "Language-Team: Arabic (Iraq) (https://app.transifex.com/hisp-uio/teams/100509/ar_IQ/)\n"
@@ -72,6 +72,16 @@ msgstr ""
 msgid "Last updated"
 msgstr "آخر تحديث"
 
+msgid "error encountered during field validation"
+msgstr "حدث خطأ أثناء التحقق من صحة الحقل"
+
+msgid "error"
+msgstr "خطأ"
+
+msgid ""
+"Plugins are not yet available - Please contact your system administrator"
+msgstr ""
+
 msgid "This value is validating"
 msgstr "يتم التحقق من القيمة"
 
@@ -365,9 +375,6 @@ msgstr "لا تزال بعض العمليات قيد التشغيل. أرجو ا
 msgid "Operations running"
 msgstr "العمليات الجارية"
 
-msgid "Sort"
-msgstr "فرز"
-
 msgid ""
 "This event has unsaved changes. Leaving this page without saving will lose "
 "these changes. Are you sure you want to discard unsaved changes?"
@@ -481,6 +488,12 @@ msgstr "تحميل الصورة"
 msgid "Select image"
 msgstr "حدد الصورة"
 
+msgid "Type to filter options"
+msgstr ""
+
+msgid "No match found"
+msgstr ""
+
 msgid "Search"
 msgstr "البحث"
 
@@ -746,7 +759,7 @@ msgstr ""
 msgid "Refer"
 msgstr ""
 
-msgid "You can’t add any more {{ programStageName }} events"
+msgid "You can't add any more {{ programStageName }} events"
 msgstr ""
 
 msgid "Cancel without saving"
@@ -810,6 +823,9 @@ msgstr ""
 msgid "New Enrollment in program{{escape}} {{programName}}"
 msgstr ""
 
+msgid "Save {{trackedEntityTypeName}}"
+msgstr ""
+
 msgid "Save {{trackedEntityName}}"
 msgstr ""
 
@@ -963,15 +979,6 @@ msgstr ""
 msgid "Choose a type to start searching"
 msgstr ""
 
-msgid "Fill in at least {{count}} attribute to search"
-msgid_plural "Fill in at least {{count}} attribute to search"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-
 msgid "Search {{name}}"
 msgstr ""
 
@@ -1124,6 +1131,9 @@ msgstr ""
 msgid "Mark for follow-up"
 msgstr ""
 
+msgid "Existing dates for auto-generated events will not be updated."
+msgstr ""
+
 msgid "Enrollment date"
 msgstr "تاريخ التسجيل"
 
@@ -1212,32 +1222,12 @@ msgid ""
 "The scheduled date matches the suggested date, but can be changed if needed."
 msgstr ""
 
-msgid "The scheduled date is {{count}} days {{position}} the suggested date."
-msgid_plural ""
-"The scheduled date is {{count}} days {{position}} the suggested date."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-
 msgid "after"
 msgstr ""
 
 msgid "before"
 msgstr ""
 
-msgid "There are {{count}} scheduled event in {{orgUnitName}} on this day."
-msgid_plural ""
-"There are {{count}} scheduled event in {{orgUnitName}} on this day."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-
 msgid ""
 "Scheduling an event in {{stageName}} for {{programName}} in {{orgUnitName}}"
 msgstr ""
@@ -1281,9 +1271,6 @@ msgstr ""
 msgid "Try again or contact your system administrator for support"
 msgstr ""
 
-msgid "tracked entity instance"
-msgstr "نموذج الكيان المتتبع"
-
 msgid "Fix errors in the form to continue."
 msgstr ""
 
@@ -1296,6 +1283,9 @@ msgstr ""
 msgid "Edit"
 msgstr "تعديل"
 
+msgid "tracked entity instance"
+msgstr "نموذج الكيان المتتبع"
+
 msgid "New {{ eventName }} event"
 msgstr ""
 
@@ -1485,9 +1475,6 @@ msgstr ""
 msgid "Set coordinate"
 msgstr "ضبط الإحداثية"
 
-msgid "Page {{currentPage}}"
-msgstr ""
-
 msgid "Date"
 msgstr "التاريخ"
 
@@ -1506,11 +1493,8 @@ msgstr "حتى تاريخ"
 msgid "To time"
 msgstr "إلى وقت"
 
-msgid "error encountered during field validation"
-msgstr "حدث خطأ أثناء التحقق من صحة الحقل"
-
-msgid "error"
-msgstr "خطأ"
+msgid "Page {{currentPage}}"
+msgstr ""
 
 msgid "Delete polygon"
 msgstr "حذف المضلع"