Merge remote-tracking branch 'origin/master' into feat/support-custom…

…-plugin-DHIS2-17283
dhis2 · Oct 31, 2024 · 9a89866 · 9a89866
2 parents d3a85c3 + 9f39a9c
commit 9a89866
Show file tree

Hide file tree

Showing 18 changed files with 141 additions and 156 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -12,11 +12,18 @@ updates:
               update-types:
                   - minor
                   - patch
+          devDependencies:
+              applies-to: version-updates
+              dependency-type: development
+              update-types:
+                  - minor
+                  - patch
           dependencies:
               applies-to: version-updates
+              dependency-type: production
               update-types:
                   - minor
                   - patch
               exclude-patterns:
                   - '*@dhis2*'
-                  - '*i18next*'
+                  - 'react-grid-layout'
diff --git a/.github/workflows/dhis2-preview-pr.yml b/.github/workflows/dhis2-preview-pr.yml
@@ -21,20 +21,20 @@ jobs:
         runs-on: ubuntu-latest
         if: "!github.event.push.repository.fork && github.actor != 'dependabot[bot]'"
         steps:
-            - uses: actions/checkout@v2
-            - uses: actions/setup-node@v1
+            - uses: actions/checkout@v4
+            - uses: actions/setup-node@v4
               with:
                   node-version: 18.x
 
-            - uses: c-hive/gha-yarn-cache@v1
+            - uses: c-hive/gha-yarn-cache@v2
             - run: yarn install --frozen-lockfile
 
             - name: Build
               run: yarn d2-app-scripts build --standalone
 
             - name: Deploy
               id: netlify-deploy
-              uses: nwtgck/actions-netlify@v1.2.2
+              uses: nwtgck/actions-netlify@v3
               timeout-minutes: 1
               with:
                   github-token: ${{ secrets.DHIS2_BOT_GITHUB_TOKEN }}

diff --git a/.github/workflows/dhis2-verify-commits.yml b/.github/workflows/dhis2-verify-commits.yml
@@ -8,8 +8,8 @@ jobs:
     lint-pr-title:
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v2
-            - uses: c-hive/gha-yarn-cache@v1
+            - uses: actions/checkout@v4
+            - uses: c-hive/gha-yarn-cache@v2
             - run: yarn install --frozen-lockfile
             - id: commitlint
               run: echo ::set-output name=config_path::$(node -e "process.stdout.write(require('@dhis2/cli-style').config.commitlint)")
@@ -20,13 +20,15 @@ jobs:
     lint-commits:
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v4
               with:
                   fetch-depth: 0
-            - uses: c-hive/gha-yarn-cache@v1
+            - uses: c-hive/gha-yarn-cache@v2
             - run: yarn install --frozen-lockfile
             - id: commitlint
+              # This will return a config file with a .js extensions for @dhis2/cli-style v10
               run: echo ::set-output name=config_path::$(node -e "process.stdout.write(require('@dhis2/cli-style').config.commitlint)")
-            - uses: wagoid/commitlint-github-action@v4
+              # commitlint-github-action@v6+ requires a .mjs extension for the config file, so the highest version we can use is 5
+            - uses: wagoid/commitlint-github-action@v5
               with:
                   configFile: ${{ steps.commitlint.outputs.config_path }}
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -24,8 +24,8 @@ jobs:
                 containers: [1, 2, 3, 4]
 
         steps:
-            - uses: actions/checkout@v3
-            - uses: actions/setup-node@v3
+            - uses: actions/checkout@v4
+            - uses: actions/setup-node@v4
               with:
                   node-version: 18.x
 
@@ -63,7 +63,7 @@ jobs:
         steps:
             - name: Send failure message to analytics-internal-kfmt slack channel
               id: slack
-              uses: slackapi/slack-github-action@v1.23.0
+              uses: slackapi/slack-github-action@v1.27.0
               with:
                   channel-id: ${{ secrets.SLACK_CHANNEL_ID }}
                   slack-message: ':dashboard-app: Dashboard-app e2e nightly run <https://cloud.cypress.io/projects/5fk191/runs?branches=[{"label":"dev","suggested":false,"value":"dev"}]|failed>'

diff --git a/.github/workflows/publish-d2-ci.yml b/.github/workflows/publish-d2-ci.yml
@@ -31,9 +31,9 @@ jobs:
             - name: Print GitHub ref
               run: echo "GITHUB_REF is $GITHUB_REF" and actor is ${{ github.actor }}
 
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
 
-            - uses: actions/setup-node@v3
+            - uses: actions/setup-node@v4
               with:
                   node-version: 18.x
 
@@ -56,7 +56,7 @@ jobs:
         steps:
             - name: Send failure message to analytics-internal-bot slack channel
               id: slack_publish_failure
-              uses: slackapi/slack-github-action@v1.23.0
+              uses: slackapi/slack-github-action@v1.27.0
               with:
                   channel-id: ${{ secrets.SLACK_CHANNEL_ID }}
                   payload: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -31,11 +31,11 @@ jobs:
             - name: Print GitHub ref
               run: echo "GITHUB_REF is $GITHUB_REF" and actor is ${{ github.actor }}
 
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
               with:
                   token: ${{ secrets.DHIS2_BOT_GITHUB_TOKEN }}
 
-            - uses: actions/setup-node@v3
+            - uses: actions/setup-node@v4
               with:
                   node-version: 18.x
 
@@ -70,12 +70,12 @@ jobs:
             - name: Extract version
               if: success()
               id: extract_version
-              uses: Saionaro/extract-package-version@v1.2.1
+              uses: Saionaro/extract-package-version@v1.3.0
 
             - name: Send success message to analytics-internal-bot slack channel
               if: success()
               id: slack_success
-              uses: slackapi/slack-github-action@v1.23.0
+              uses: slackapi/slack-github-action@v1.27.0
               with:
                   channel-id: ${{ secrets.SLACK_CHANNEL_ID }}
                   payload: |
@@ -125,7 +125,7 @@ jobs:
             - name: Send failure message to analytics-internal-bot slack channel
               if: ${{ failure() && !cancelled() }}
               id: slack_failure
-              uses: slackapi/slack-github-action@v1.23.0
+              uses: slackapi/slack-github-action@v1.27.0
               with:
                   channel-id: ${{ secrets.SLACK_CHANNEL_ID }}
                   payload: |

diff --git a/.github/workflows/verify-pr.yml b/.github/workflows/verify-pr.yml
@@ -18,16 +18,16 @@ jobs:
         outputs:
             matrix: ${{ steps.set-matrix.outputs.specs }}
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
             - name: Generate Test matrix
               id: set-matrix
               run: echo "::set-output name=specs::$(node cypress/support/generateTestMatrix.js)"
 
     build:
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v3
-            - uses: actions/setup-node@v3
+            - uses: actions/checkout@v4
+            - uses: actions/setup-node@v4
               with:
                   node-version: 18.x
 
@@ -37,7 +37,7 @@ jobs:
             - name: Build
               run: yarn d2-app-scripts build
 
-            - uses: actions/upload-artifact@v3
+            - uses: actions/upload-artifact@v4
               with:
                   name: app-build
                   path: |
@@ -48,8 +48,8 @@ jobs:
     lint:
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v3
-            - uses: actions/setup-node@v3
+            - uses: actions/checkout@v4
+            - uses: actions/setup-node@v4
               with:
                   node-version: 18.x
 
@@ -65,8 +65,8 @@ jobs:
     test:
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v3
-            - uses: actions/setup-node@v3
+            - uses: actions/checkout@v4
+            - uses: actions/setup-node@v4
               with:
                   node-version: 18.x
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [100.3.1](https://github.com/dhis2/dashboard-app/compare/v100.3.0...v100.3.1) (2024-10-31)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([fb3b4a8](https://github.com/dhis2/dashboard-app/commit/fb3b4a8ca3d0be5a403882cca5c8d399ec2512fb))
+
 # [100.3.0](https://github.com/dhis2/dashboard-app/compare/v100.2.5...v100.3.0) (2024-09-26)
 
 

diff --git a/i18n/es.po b/i18n/es.po
@@ -6,17 +6,17 @@
 # Prabhjot Singh, 2021
 # Viktor Varland <[email protected]>, 2021
 # Marta Vila <[email protected]>, 2023
-# Enzo Nicolas Rossi <[email protected]>, 2023
 # Janeth Cruz, 2023
 # Philip Larsen Donnelly, 2024
 # Gabriela Rodriguez <[email protected]>, 2024
+# Enzo Nicolas Rossi <[email protected]>, 2024
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2024-03-19T12:31:03.302Z\n"
+"POT-Creation-Date: 2024-08-27T07:26:05.058Z\n"
 "PO-Revision-Date: 2019-06-25 12:37+0000\n"
-"Last-Translator: Gabriela Rodriguez <[email protected]>, 2024\n"
+"Last-Translator: Enzo Nicolas Rossi <[email protected]>, 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"
@@ -93,9 +93,11 @@ msgstr "Filtros no aplicados"
 
 msgid "Only Period and Organisation unit filters can be applied to this item"
 msgstr ""
+"A este elemento sólo se le pueden aplicar los filtros Período y Unidad "
+"organizativa."
 
 msgid "Some filters not applied"
-msgstr ""
+msgstr "Algunos filtros no aplicados"
 
 msgid "There was a problem loading this dashboard item"
 msgstr "Ha habido un problema al cargar este elemento del tablero"
@@ -116,19 +118,19 @@ msgid "This map can't be displayed as a chart"
 msgstr "Este mapa no se puede mostrar como gráfico"
 
 msgid "This map can't be displayed as a pivot table"
-msgstr ""
+msgstr "Este mapa no se puede mostrar como una tabla dinámica"
 
 msgid "This visualization can't be displayed as a pivot table"
-msgstr ""
+msgstr "Esta visualización no puede mostrarse como una tabla dinámica"
 
 msgid "This visualization can't be displayed as a map"
-msgstr ""
+msgstr "Esta visualización no puede mostrarse como un mapa"
 
 msgid "View as Chart"
 msgstr "Ver como gráfico"
 
 msgid "View as Pivot table"
-msgstr ""
+msgstr "Ver como tabla dinámica"
 
 msgid "View as Map"
 msgstr "Ver como mapa"
@@ -339,6 +341,9 @@ msgstr "Mostrar menos"
 msgid "Show more"
 msgstr "Mostrar más"
 
+msgid "Open visualization in new tab"
+msgstr ""
+
 msgid "Insert"
 msgstr "Insertar"
 

diff --git a/i18n/lo.po b/i18n/lo.po
@@ -3,15 +3,15 @@
 # Viktor Varland <[email protected]>, 2020
 # Philip Larsen Donnelly, 2021
 # Somkhit Bouavong <[email protected]>, 2022
-# Saysamone Sibounma, 2023
 # Namwan Chanthavisouk, 2024
+# Saysamone Sibounma, 2024
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2024-03-19T12:31:03.302Z\n"
+"POT-Creation-Date: 2024-08-27T07:26:05.058Z\n"
 "PO-Revision-Date: 2019-06-25 12:37+0000\n"
-"Last-Translator: Namwan Chanthavisouk, 2024\n"
+"Last-Translator: Saysamone Sibounma, 2024\n"
 "Language-Team: Lao (https://app.transifex.com/hisp-uio/teams/100509/lo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -260,7 +260,7 @@ msgid ""
 msgstr ""
 
 msgid "No, stay here"
-msgstr ""
+msgstr "ບໍ່, ຢູ່ໜ້ານີ້"
 
 msgid "Yes, discard changes"
 msgstr "ຕົກລົງ, ຍົກເລີກການປ່ຽນແປງ"
@@ -310,6 +310,9 @@ msgstr "ສະແດງໜ່ອຍລົງ"
 msgid "Show more"
 msgstr "ສະແດງຫຼາຍ"
 
+msgid "Open visualization in new tab"
+msgstr ""
+
 msgid "Insert"
 msgstr "ເພີ່ມເຂົ້າ"
 
@@ -417,7 +420,7 @@ msgid ""
 msgstr ""
 
 msgid "Getting started"
-msgstr ""
+msgstr "ເລີ່ມຕົ້ນ"
 
 msgid "Search for and open saved dashboards from the top bar."
 msgstr ""
@@ -520,7 +523,7 @@ msgid "No description"
 msgstr "ບໍ່ມີຄຳອະທິບາຍ"
 
 msgid "Add filter"
-msgstr ""
+msgstr "ເພີ່ມຕົວກອງ"
 
 msgid "Offline data last updated {{time}}"
 msgstr ""

diff --git a/i18n/zh.po b/i18n/zh.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2024-03-19T12:31:03.302Z\n"
+"POT-Creation-Date: 2024-08-27T07:26:05.058Z\n"
 "PO-Revision-Date: 2019-06-25 12:37+0000\n"
 "Last-Translator: easylin <[email protected]>, 2024\n"
 "Language-Team: Chinese (https://app.transifex.com/hisp-uio/teams/100509/zh/)\n"
@@ -19,10 +19,10 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 msgid "Untitled dashboard"
-msgstr "未命名的仪表板"
+msgstr "未命名的仪表盘"
 
 msgid "Cannot create a dashboard while offline"
-msgstr "离线时无法创建仪表板"
+msgstr "离线时无法创建仪表盘"
 
 msgid "Create new dashboard"
 msgstr "创建新仪表盘"
@@ -182,7 +182,7 @@ msgid "Event charts"
 msgstr "事件图表应用"
 
 msgid "Line lists"
-msgstr "行列表"
+msgstr "行列表应用"
 
 msgid "Apps"
 msgstr "应用商店"
@@ -316,6 +316,9 @@ msgstr "显示较少"
 msgid "Show more"
 msgstr "显示更多"
 
+msgid "Open visualization in new tab"
+msgstr "在新标签页中打开可视化应用"
+
 msgid "Insert"
 msgstr "插入"
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "dashboard-app",
-    "version": "100.3.0",
+    "version": "100.3.1",
     "description": "DHIS2 Dashboard app",
     "private": true,
     "license": "BSD-3-Clause",
@@ -15,7 +15,6 @@
         "lodash": "^4.17.21",
         "moment": "^2.30.1",
         "react": "^16.14.0",
-        "react-dom": "^16.13.1",
         "react-grid-layout": "1.2.2",
         "react-redux": "^7.2.9",
         "react-router-dom": "^5.2.0",