Merge remote-tracking branch 'origin/master' into eh/chore/UpgradeDHI…

…S2UI

# Conflicts:
#	i18n/en.pot
#	package.json

CHANGELOG.md

@@ -1,3 +1,24 @@
+## [100.50.6](https://github.com/dhis2/capture-app/compare/v100.50.5...v100.50.6) (2024-01-21)
+
+
+### Bug Fixes
+
+* [DHIS2-16352] Add spacing between event overview cards ([#3500](https://github.com/dhis2/capture-app/issues/3500)) ([2041d60](https://github.com/dhis2/capture-app/commit/2041d605454529b3bcd77fa3b53a4655ae1495cf))
+
+## [100.50.5](https://github.com/dhis2/capture-app/compare/v100.50.4...v100.50.5) (2024-01-21)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([eca1ba4](https://github.com/dhis2/capture-app/commit/eca1ba418e672a58df08785b74430c60e8eb9bcb))
+
+## [100.50.4](https://github.com/dhis2/capture-app/compare/v100.50.3...v100.50.4) (2024-01-14)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([ad60c3a](https://github.com/dhis2/capture-app/commit/ad60c3a4500176c8db08ceb05e074eedfcf5e2b3))
+
 ## [100.50.3](https://github.com/dhis2/capture-app/compare/v100.50.2...v100.50.3) (2023-12-24)
 
 

i18n/es.po

@@ -10,16 +10,16 @@
 # Janeth Cruz, 2023
 # Prabhjot Singh, 2023
 # Christian Atavillos, 2023
-# Enzo Nicolas Rossi <[email protected]>, 2023
 # Gabriela Rodriguez <[email protected]>, 2023
 # Viktor Varland <[email protected]>, 2023
+# Enzo Nicolas Rossi <[email protected]>, 2024
 # 
 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: Viktor Varland <viktor@dhis2.org>, 2023\n"
+"Last-Translator: Enzo Nicolas Rossi <enzo@dhis2.org>, 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"
@@ -176,7 +176,7 @@ msgid "Complete event"
 msgstr "Completar el evento"
 
 msgid "{{ stageName }} - Basic info"
-msgstr ""
+msgstr "{{ stageName }} - Información básica"
 
 msgid "{{ stageName }} - Status"
 msgstr ""

i18n/es_419.po

@@ -1,14 +1,14 @@
 # 
 # Translators:
-# Enzo Nicolas Rossi <[email protected]>, 2023
 # Jaime Bosque <[email protected]>, 2023
+# Enzo Nicolas Rossi <[email protected]>, 2024
 # 
 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: Jaime Bosque <jaime.bosque@dhis2.org>, 2023\n"
+"Last-Translator: Enzo Nicolas Rossi <enzo@dhis2.org>, 2024\n"
 "Language-Team: Spanish (Latin America) (https://app.transifex.com/hisp-uio/teams/100509/es_419/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1281,7 +1281,7 @@ msgid "Scheduled date cannot be changed for {{ eventStatus }} events"
 msgstr ""
 
 msgid "Event completed"
-msgstr ""
+msgstr "Evento completado"
 
 msgid "Back to all stages and events"
 msgstr "Volver a todas las etapas y eventos"
@@ -1431,7 +1431,7 @@ msgid "Working list could not be loaded"
 msgstr ""
 
 msgid "Download as JSON"
-msgstr ""
+msgstr "Descargar como JSON"
 
 msgid "Download as CSV"
 msgstr ""
@@ -1512,7 +1512,7 @@ msgid "Show All"
 msgstr ""
 
 msgid "An error has occured. See log for details"
-msgstr ""
+msgstr " Ha ocurrido un error. Ver el registro para más detalles."
 
 msgid "Scheduled{{ escape }} due {{ time }}"
 msgstr ""

i18n/nb.po

@@ -1,14 +1,14 @@
 # 
 # Translators:
 # Caroline Hesthagen Holen <[email protected]>, 2023
-# Karoline Tufte Lien <[email protected]>, 2023
+# Karoline Tufte Lien <[email protected]>, 2024
 # 
 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: Karoline Tufte Lien <[email protected]>, 2023\n"
+"Last-Translator: Karoline Tufte Lien <[email protected]>, 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"
@@ -756,7 +756,7 @@ msgstr ""
 "{{tetName}}."
 
 msgid "Enroll a new {{selectedTetName}} in this program."
-msgstr "Registrer en ny {{teiDisplayName}} i dette programmet"
+msgstr "Registrer en ny {{selectedTetName}} i dette programmet"
 
 msgid "{{programName}} is an event program and does not have enrollments."
 msgstr "{{programName}} er et hendelsesprogram og har ikke registreringer."
@@ -837,7 +837,7 @@ msgid "Registered events"
 msgstr "Registrerte hendelser"
 
 msgid "Please select {{category}}."
-msgstr "Velg {{kategori}}."
+msgstr "Velg {{category}}."
 
 msgid "Or see all records accessible to you in {{program}} "
 msgstr "Eller se alle opptegnelser som er tilgjengelige for deg i {{program}}"

package.json

@@ -1,7 +1,7 @@
 {
     "name": "capture-app",
     "homepage": ".",
-    "version": "100.50.3",
+    "version": "100.50.6",
     "cacheVersion": "7",
     "serverVersion": "38",
     "license": "BSD-3-Clause",
@@ -10,14 +10,14 @@
         "packages/rules-engine"
     ],
     "dependencies": {
+        "@dhis2/rules-engine-javascript": "100.50.6",
         "@dhis2/app-runtime": "^3.9.3",
         "@dhis2/d2-i18n": "^1.1.0",
         "@dhis2/d2-icons": "^1.0.1",
         "@dhis2/d2-ui-app": "^2.0.0",
         "@dhis2/d2-ui-org-unit-tree": "^7.3.3",
         "@dhis2/d2-ui-rich-text": "^7.4.0",
         "@dhis2/d2-ui-sharing-dialog": "^7.3.3",
-        "@dhis2/rules-engine-javascript": "100.50.3",
         "@dhis2/ui": "^9.1.1",
         "@joakim_sm/react-infinite-calendar": "^2.4.2",
         "@material-ui/core": "3.9.4",

packages/rules-engine/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/rules-engine-javascript",
-    "version": "100.50.3",
+    "version": "100.50.6",
     "license": "BSD-3-Clause",
     "main": "./build/cjs/index.js",
     "scripts": {

src/core_modules/capture-core/components/Pages/ViewEvent/RightColumn/RightColumnWrapper.component.js

@@ -1,6 +1,7 @@
 
 // @flow
 import * as React from 'react';
+import { spacers } from '@dhis2/ui';
 import { withStyles } from '@material-ui/core/styles';
 import { ErrorsSection } from './ErrorsSection/ErrorsSection.container';
 import { WarningsSection } from './WarningsSection/WarningsSection.container';
@@ -18,9 +19,12 @@ type Props = {
 
 const getStyles = (theme: Theme) => ({
     container: {
+        display: 'flex',
+        flexDirection: 'column',
         flexBasis: theme.typography.pxToRem(0),
         flexGrow: 1,
         minWidth: theme.typography.pxToRem(300),
+        gap: spacers.dp16,
     },
 });
 

yarn.lock

@@ -9481,9 +9481,9 @@ flush-write-stream@^1.0.0, flush-write-stream@^1.0.2:
     readable-stream "^2.3.6"
 
 follow-redirects@^1.0.0, follow-redirects@^1.14.7:
-  version "1.15.2"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
-  integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
+  version "1.15.4"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.4.tgz#cdc7d308bf6493126b17ea2191ea0ccf3e535adf"
+  integrity sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==
 
 for-each@^0.3.3:
   version "0.3.3"