From ad60c3a4500176c8db08ceb05e074eedfcf5e2b3 Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Sun, 14 Jan 2024 02:39:35 +0100 Subject: [PATCH 1/7] fix(translations): sync translations from transifex (master) Automatically merged. --- i18n/es.po | 6 +++--- i18n/nb.po | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/i18n/es.po b/i18n/es.po index 67b54c1201..bdbd09c1ac 100644 --- a/i18n/es.po +++ b/i18n/es.po @@ -10,16 +10,16 @@ # Janeth Cruz, 2023 # Prabhjot Singh, 2023 # Christian Atavillos, 2023 -# Enzo Nicolas Rossi , 2023 # Gabriela Rodriguez , 2023 # Viktor Varland , 2023 +# Enzo Nicolas Rossi , 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 , 2023\n" +"Last-Translator: Enzo Nicolas Rossi , 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 "" diff --git a/i18n/nb.po b/i18n/nb.po index 00e615f61b..16e7fc4490 100644 --- a/i18n/nb.po +++ b/i18n/nb.po @@ -1,14 +1,14 @@ # # Translators: # Caroline Hesthagen Holen , 2023 -# Karoline Tufte Lien , 2023 +# Karoline Tufte Lien , 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 , 2023\n" +"Last-Translator: Karoline Tufte Lien , 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}}" From a31186868592366f5cdf38bbc7979ba660caebb3 Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Sun, 14 Jan 2024 01:48:59 +0000 Subject: [PATCH 2/7] chore(release): cut 100.50.4 [skip release] ## [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)) --- 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 a8bdf704ec..cdbb92ea90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [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) diff --git a/package.json b/package.json index b407d2b323..f9f27dc1ea 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "capture-app", "homepage": ".", - "version": "100.50.3", + "version": "100.50.4", "cacheVersion": "7", "serverVersion": "38", "license": "BSD-3-Clause", @@ -10,7 +10,7 @@ "packages/rules-engine" ], "dependencies": { - "@dhis2/rules-engine-javascript": "100.50.3", + "@dhis2/rules-engine-javascript": "100.50.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 56222b22a5..6cda147e6c 100644 --- a/packages/rules-engine/package.json +++ b/packages/rules-engine/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/rules-engine-javascript", - "version": "100.50.3", + "version": "100.50.4", "license": "BSD-3-Clause", "main": "./build/cjs/index.js", "scripts": { From 364158d2d63e30953256dc3880e6e622f335c2c5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Jan 2024 11:48:57 +0100 Subject: [PATCH 3/7] chore(deps): bump follow-redirects from 1.15.2 to 1.15.4 (#3503) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 8be06b9e02..9635d37f78 100644 --- a/yarn.lock +++ b/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" From eca1ba418e672a58df08785b74430c60e8eb9bcb Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Sun, 21 Jan 2024 02:39:52 +0100 Subject: [PATCH 4/7] fix(translations): sync translations from transifex (master) Automatically merged. --- i18n/es_419.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/i18n/es_419.po b/i18n/es_419.po index 9e781ff26a..b9754779c5 100644 --- a/i18n/es_419.po +++ b/i18n/es_419.po @@ -1,14 +1,14 @@ # # Translators: -# Enzo Nicolas Rossi , 2023 # Jaime Bosque , 2023 +# Enzo Nicolas Rossi , 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 , 2023\n" +"Last-Translator: Enzo Nicolas Rossi , 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 "" From 2d20b22b56de6be70879dc804220979789a4f207 Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Sun, 21 Jan 2024 01:47:23 +0000 Subject: [PATCH 5/7] chore(release): cut 100.50.5 [skip release] ## [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)) --- 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 cdbb92ea90..107711ecd2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [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) diff --git a/package.json b/package.json index f9f27dc1ea..2a2d7d8c8d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "capture-app", "homepage": ".", - "version": "100.50.4", + "version": "100.50.5", "cacheVersion": "7", "serverVersion": "38", "license": "BSD-3-Clause", @@ -10,7 +10,7 @@ "packages/rules-engine" ], "dependencies": { - "@dhis2/rules-engine-javascript": "100.50.4", + "@dhis2/rules-engine-javascript": "100.50.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 6cda147e6c..8ef5b8aafb 100644 --- a/packages/rules-engine/package.json +++ b/packages/rules-engine/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/rules-engine-javascript", - "version": "100.50.4", + "version": "100.50.5", "license": "BSD-3-Clause", "main": "./build/cjs/index.js", "scripts": { From 2041d605454529b3bcd77fa3b53a4655ae1495cf Mon Sep 17 00:00:00 2001 From: eirikhaugstulen Date: Sun, 21 Jan 2024 12:39:29 +0500 Subject: [PATCH 6/7] fix: [DHIS2-16352] Add spacing between event overview cards (#3500) --- i18n/en.pot | 10 +++++----- .../RightColumn/RightColumnWrapper.component.js | 4 ++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/i18n/en.pot b/i18n/en.pot index 0dd6fab89a..ef299b3aab 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: 2023-09-12T06:24:49.265Z\n" -"PO-Revision-Date: 2023-09-12T06:24:49.265Z\n" +"POT-Creation-Date: 2024-01-07T14:04:56.420Z\n" +"PO-Revision-Date: 2024-01-07T14:04:56.420Z\n" msgid "Choose one or more dates..." msgstr "Choose one or more dates..." @@ -1380,6 +1380,9 @@ msgstr "This stage can only have one event" msgid "Events could not be retrieved. Please try again later." msgstr "Events could not be retrieved. Please try again later." +msgid "Assigned to" +msgstr "Assigned to" + msgid "{{ totalEvents }} events" msgstr "{{ totalEvents }} events" @@ -1446,9 +1449,6 @@ msgstr "Download data..." msgid "an error occurred loading working lists" msgstr "an error occurred loading working lists" -msgid "Assigned to" -msgstr "Assigned to" - msgid "Registration Date" msgstr "Registration Date" diff --git a/src/core_modules/capture-core/components/Pages/ViewEvent/RightColumn/RightColumnWrapper.component.js b/src/core_modules/capture-core/components/Pages/ViewEvent/RightColumn/RightColumnWrapper.component.js index 344c6b4698..307d8ccd30 100644 --- a/src/core_modules/capture-core/components/Pages/ViewEvent/RightColumn/RightColumnWrapper.component.js +++ b/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, }, }); From 32c1ca1d76b63cd9ee4db153f18bbdfd232c0438 Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Sun, 21 Jan 2024 07:45:23 +0000 Subject: [PATCH 7/7] chore(release): cut 100.50.6 [skip release] ## [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)) --- 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 107711ecd2..a2fd286dc5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [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) diff --git a/package.json b/package.json index 2a2d7d8c8d..fe09b719c2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "capture-app", "homepage": ".", - "version": "100.50.5", + "version": "100.50.6", "cacheVersion": "7", "serverVersion": "38", "license": "BSD-3-Clause", @@ -10,7 +10,7 @@ "packages/rules-engine" ], "dependencies": { - "@dhis2/rules-engine-javascript": "100.50.5", + "@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", diff --git a/packages/rules-engine/package.json b/packages/rules-engine/package.json index 8ef5b8aafb..095f43a095 100644 --- a/packages/rules-engine/package.json +++ b/packages/rules-engine/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/rules-engine-javascript", - "version": "100.50.5", + "version": "100.50.6", "license": "BSD-3-Clause", "main": "./build/cjs/index.js", "scripts": {