Merge branch 'feat/tracked-entity-input' into feat/timedimensions-wit…

…h-programid-prefix

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [100.12.1](https://github.com/dhis2/line-listing-app/compare/v100.12.0...v100.12.1) (2024-01-14)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([f232d4e](https://github.com/dhis2/line-listing-app/commit/f232d4ee006069ca4230028f3cb3816b6495a146))
+
 # [100.12.0](https://github.com/dhis2/line-listing-app/compare/v100.11.4...v100.12.0) (2024-01-12)
 
 

cypress/integration/conditions/alphanumericConditions.cy.js

@@ -97,7 +97,7 @@ describe('text conditions', { testIsolation: false }, () => {
 
         expectTableToBeVisible()
 
-        cy.getBySelLike('layout-chip').contains(`${dimensionName}: all`)
+        assertChipContainsText(dimensionName, 'all')
     })
 
     it('exactly', () => {

cypress/integration/createTrackedEntity.cy.js

@@ -10,6 +10,7 @@ import {
     selectProgramForTE,
     selectTrackedEntityWithType,
 } from '../helpers/dimensions.js'
+import { assertChipContainsText } from '../helpers/layout.js'
 import { clickMenubarUpdateButton } from '../helpers/menubar.js'
 import { goToStartPage } from '../helpers/startScreen.js'
 import { expectTableToBeVisible } from '../helpers/table.js'
@@ -103,7 +104,7 @@ const setUpTable = () => {
 
     expectTableToBeVisible()
 
-    cy.getBySelLike('layout-chip').contains(`${entityDimensionName}: all`)
+    assertChipContainsText(entityDimensionName, 'all')
 }
 
 // const runTests = () => {
@@ -120,20 +121,11 @@ const setUpTable = () => {
 //         getTableHeaderCells().contains(periodLabel).should('be.visible')
 
 //         //check the chips in the layout
-//         cy.getBySel('columns-axis')
-//             .findBySelLike('layout-chip')
-//             .contains('Organisation unit: 1 selected')
-//             .should('be.visible')
+//         assertChipContainsText('Organisation unit', 1)
 
-//         cy.getBySel('columns-axis')
-//             .findBySelLike('layout-chip')
-//             .contains(`${entityDimensionName}: all`)
-//             .should('be.visible')
+//         assertChipContainsText(entityDimensionName, 'all')
 
-//         cy.getBySel('columns-axis')
-//             .findBySelLike('layout-chip')
-//             .contains(`${periodLabel}: 1 selected`)
-//             .should('be.visible')
+//         assertChipContainsText(periodLabel, 1)
 //     })
 
 //     it('moves a dimension to filter', () => {
@@ -180,19 +172,8 @@ const setUpTable = () => {
 //         getTableHeaderCells().contains(periodLabel).should('not.exist')
 
 //         //check the chips in the layout
-//         cy.getBySel('columns-axis')
-//             .findBySelLike('layout-chip')
-//             .contains('Organisation unit: 1 selected')
-//             .should('be.visible')
-
-//         cy.getBySel('columns-axis')
-//             .findBySelLike('layout-chip')
-//             .contains(`${entityDimensionName}: all`)
-//             .should('be.visible')
-
-//         cy.getBySel('filters-axis')
-//             .findBySelLike('layout-chip')
-//             .contains(`${periodLabel}: 1 selected`)
-//             .should('be.visible')
+//         assertChipContainsText('Organisation unit', 1)
+//         assertChipContainsText(entityDimensionName, 'all')
+//         assertChipContainsText(periodLabel, 1)
 //     })
 // }

cypress/integration/programStatus.cy.js

@@ -53,10 +53,7 @@ describe(['>=41'], 'program status (tracked entity)', () => {
             .contains('Enrollment PROGRAM_STATUS')
             .should('be.visible')
 
-        cy.getBySel('columns-axis')
-            .findBySelLike('layout-chip')
-            .contains(`${dimensionName}: all`)
-            .should('be.visible')
+        assertChipContainsText(dimensionName, 'all')
 
         // Add filter 'Completed'
 
@@ -76,7 +73,7 @@ describe(['>=41'], 'program status (tracked entity)', () => {
 
         expectTableToMatchRows(['Completed'])
 
-        assertChipContainsText(`${dimensionName}: 1 selected`)
+        assertChipContainsText(dimensionName, 1)
 
         assertTooltipContainsEntries(['Completed'])
     })

i18n/ar.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2023-09-05T07:20:57.111Z\n"
+"POT-Creation-Date: 2024-01-12T10:52:11.438Z\n"
 "PO-Revision-Date: 2022-08-23 11:50+0000\n"
 "Last-Translator: Hamza Assada <[email protected]>, 2023\n"
 "Language-Team: Arabic (https://app.transifex.com/hisp-uio/teams/100509/ar/)\n"
@@ -170,24 +170,6 @@ msgstr "تنزيل"
 msgid "all"
 msgstr ""
 
-msgid "{{count}} selected"
-msgid_plural "{{count}} selected"
-msgstr[0] "تم تحديد {{count}}"
-msgstr[1] "تم تحديد {{count}}"
-msgstr[2] "تم تحديد {{count}}"
-msgstr[3] "تم تحديد {{count}}"
-msgstr[4] "تم تحديد {{count}}"
-msgstr[5] "تم تحديد {{count}}"
-
-msgid "{{count}} conditions"
-msgid_plural "{{count}} conditions"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-
 msgid "Levels"
 msgstr "المستويات"
 
@@ -386,9 +368,17 @@ msgstr ""
 msgid "Not available offline"
 msgstr "غير متوفر في وضع عدم الإتصال"
 
+msgid ""
+"This line list may show data that was not available when the interpretation "
+"was written."
+msgstr ""
+
 msgid "Sort by {{column}}"
 msgstr ""
 
+msgid "No event"
+msgstr ""
+
 msgid "Rows per page"
 msgstr "عدد الصفوف لكل صفحة"
 
@@ -636,6 +626,14 @@ msgstr ""
 msgid "Something went wrong"
 msgstr "حدث خطأ ما"
 
+msgid ""
+"There's a problem with the generated analytics. Contact a system "
+"administrator."
+msgstr ""
+
+msgid "There's a syntax problem with the analytics request."
+msgstr ""
+
 msgid "Last updated on"
 msgstr ""
 

i18n/cs.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2023-11-29T10:50:15.561Z\n"
+"POT-Creation-Date: 2024-01-12T10:52:11.438Z\n"
 "PO-Revision-Date: 2022-08-23 11:50+0000\n"
 "Last-Translator: Jiří Podhorecký, 2023\n"
 "Language-Team: Czech (https://app.transifex.com/hisp-uio/teams/100509/cs/)\n"
@@ -174,20 +174,6 @@ msgstr "Stáhnout"
 msgid "all"
 msgstr "vše"
 
-msgid "{{count}} selected"
-msgid_plural "{{count}} selected"
-msgstr[0] "Vybrán: {{count}}"
-msgstr[1] "Vybráno: {{count}}"
-msgstr[2] "Vybráno: {{count}}"
-msgstr[3] "Vybráno: {{count}}"
-
-msgid "{{count}} conditions"
-msgid_plural "{{count}} conditions"
-msgstr[0] "{{count}} podmínka"
-msgstr[1] "{{count}} podmínky"
-msgstr[2] "{{count}} podmínek"
-msgstr[3] "{{count}} podmínek"
-
 msgid "Levels"
 msgstr "Úrovně"
 
@@ -658,6 +644,14 @@ msgstr "Nemáte přístup k analýze událostí. Kontaktujte správce systému."
 msgid "Something went wrong"
 msgstr "Něco se pokazilo"
 
+msgid ""
+"There's a problem with the generated analytics. Contact a system "
+"administrator."
+msgstr ""
+
+msgid "There's a syntax problem with the analytics request."
+msgstr ""
+
 msgid "Last updated on"
 msgstr "Naposledy aktualizováno dne"
 

i18n/es.po

@@ -1,22 +1,21 @@
 # 
 # Translators:
+# Prabhjot Singh, 2022
 # Alison Andrade <[email protected]>, 2022
 # Pablo Pajuelo Cabezas <[email protected]>, 2022
 # Gabriela Rodriguez <[email protected]>, 2022
 # ericbp <[email protected]>, 2022
 # Philip Larsen Donnelly, 2022
 # Marta Vila <[email protected]>, 2023
-# Prabhjot Singh, 2023
 # Sergio Valenzuela <[email protected]>, 2023
 # Viktor Varland <[email protected]>, 2023
 # Enzo Nicolas Rossi <[email protected]>, 2023
-# Yury Rogachev <[email protected]>, 2023
 # Janeth Cruz, 2023
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2023-09-05T07:20:57.111Z\n"
+"POT-Creation-Date: 2024-01-12T10:52:11.438Z\n"
 "PO-Revision-Date: 2022-08-23 11:50+0000\n"
 "Last-Translator: Janeth Cruz, 2023\n"
 "Language-Team: Spanish (https://app.transifex.com/hisp-uio/teams/100509/es/)\n"
@@ -189,18 +188,6 @@ msgstr "Descargar"
 msgid "all"
 msgstr "todo"
 
-msgid "{{count}} selected"
-msgid_plural "{{count}} selected"
-msgstr[0] "{{count}} seleccionado"
-msgstr[1] "{{count}} seleccionado"
-msgstr[2] "{{count}} seleccionado"
-
-msgid "{{count}} conditions"
-msgid_plural "{{count}} conditions"
-msgstr[0] "{{count}} condición"
-msgstr[1] "{{count}} conditiones"
-msgstr[2] "{{count}} condiciones"
-
 msgid "Levels"
 msgstr "Niveles"
 
@@ -406,9 +393,17 @@ msgstr "Tus listas más vistas"
 msgid "Not available offline"
 msgstr "No disponible sin conexión a internet"
 
+msgid ""
+"This line list may show data that was not available when the interpretation "
+"was written."
+msgstr ""
+
 msgid "Sort by {{column}}"
 msgstr "Ordenar por {{column}}"
 
+msgid "No event"
+msgstr ""
+
 msgid "Rows per page"
 msgstr "Filas por página"
 
@@ -659,6 +654,14 @@ msgstr ""
 msgid "Something went wrong"
 msgstr "Algo ha ido mal"
 
+msgid ""
+"There's a problem with the generated analytics. Contact a system "
+"administrator."
+msgstr ""
+
+msgid "There's a syntax problem with the analytics request."
+msgstr ""
+
 msgid "Last updated on"
 msgstr "Ultima actualización en"
 

i18n/fr.po

@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2023-09-05T07:20:57.111Z\n"
+"POT-Creation-Date: 2024-01-12T10:52:11.438Z\n"
 "PO-Revision-Date: 2022-08-23 11:50+0000\n"
 "Last-Translator: Yayra Gomado <[email protected]>, 2023\n"
 "Language-Team: French (https://app.transifex.com/hisp-uio/teams/100509/fr/)\n"
@@ -189,18 +189,6 @@ msgstr "Télécharger"
 msgid "all"
 msgstr "Tout"
 
-msgid "{{count}} selected"
-msgid_plural "{{count}} selected"
-msgstr[0] "{{count}} selected"
-msgstr[1] "{{nombre}} sélectionnés"
-msgstr[2] "{{nombre}} sélectionnés"
-
-msgid "{{count}} conditions"
-msgid_plural "{{count}} conditions"
-msgstr[0] "{{count}} condition"
-msgstr[1] "{{nombre}} conditions"
-msgstr[2] "{{nombre}} colonnes"
-
 msgid "Levels"
 msgstr "Niveaux"
 
@@ -407,9 +395,17 @@ msgstr "Vos listes de lignes les plus consultées"
 msgid "Not available offline"
 msgstr "Non disponible hors ligne"
 
+msgid ""
+"This line list may show data that was not available when the interpretation "
+"was written."
+msgstr ""
+
 msgid "Sort by {{column}}"
 msgstr ""
 
+msgid "No event"
+msgstr ""
+
 msgid "Rows per page"
 msgstr "Lignes par page"
 
@@ -662,6 +658,14 @@ msgstr ""
 msgid "Something went wrong"
 msgstr "Quelque chose a mal tourné"
 
+msgid ""
+"There's a problem with the generated analytics. Contact a system "
+"administrator."
+msgstr ""
+
+msgid "There's a syntax problem with the analytics request."
+msgstr ""
+
 msgid "Last updated on"
 msgstr "Dernière mise à jour le"