Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into refactor/use-platfo…
Browse files Browse the repository at this point in the history
…rm-plugin-components
  • Loading branch information
edoardo committed Oct 30, 2024
2 parents e904f3b + f415d29 commit a3eb864
Show file tree
Hide file tree
Showing 1,040 changed files with 2,352 additions and 2,174 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/dhis2-preview-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ jobs:
runs-on: ubuntu-latest
if: "!github.event.push.repository.fork && github.actor != 'dependabot[bot]'"
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 18.x

Expand All @@ -33,7 +33,7 @@ jobs:

- 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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,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: ':maps-app: Maps-app e2e nightly run <https://cloud.cypress.io/projects/r5jduj/runs?branches=[{"label":"dev","suggested":false,"value":"dev"}]|failed>'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish-d2-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ jobs:
- name: Print GitHub ref
run: echo "GITHUB_REF is $GITHUB_REF"

- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 18.x

Expand All @@ -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: |
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ jobs:
!contains(github.event.head_commit.message, '[skip release]') &&
!startsWith(github.event.head_commit.message, 'chore') }}
steps:
- 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

Expand Down Expand Up @@ -62,12 +62,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: |
Expand Down Expand Up @@ -117,7 +117,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: |
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/verify-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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: |
Expand All @@ -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

Expand All @@ -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

Expand Down
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
## [100.7.2](https://github.com/dhis2/maps-app/compare/v100.7.1...v100.7.2) (2024-10-27)


### Bug Fixes

* **translations:** sync translations from transifex (master) ([915e385](https://github.com/dhis2/maps-app/commit/915e385006b594e39ae794c409ca86a70a272e1f))

## [100.7.1](https://github.com/dhis2/maps-app/compare/v100.7.0...v100.7.1) (2024-10-21)


### Bug Fixes

* add Laos language support to glyphs ([#3364](https://github.com/dhis2/maps-app/issues/3364)) ([6da46ea](https://github.com/dhis2/maps-app/commit/6da46eaa483553ae32a3629b337df473abf97eb5))

# [100.7.0](https://github.com/dhis2/maps-app/compare/v100.6.7...v100.7.0) (2024-10-04)


Expand Down
24 changes: 21 additions & 3 deletions i18n/cs.po
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#
# Translators:
# Jiří Podhorecký, 2024
# Jiří Podhorecký <jirka.p@volny.cz>, 2024
#
msgid ""
msgstr ""
"Project-Id-Version: i18next-conv\n"
"POT-Creation-Date: 2024-07-29T08:57:17.532Z\n"
"POT-Creation-Date: 2024-09-24T14:47:22.063Z\n"
"PO-Revision-Date: 2019-06-25 18:35+0000\n"
"Last-Translator: Jiří Podhorecký, 2024\n"
"Last-Translator: Jiří Podhorecký <jirka.p@volny.cz>, 2024\n"
"Language-Team: Czech (https://app.transifex.com/hisp-uio/teams/100509/cs/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand All @@ -27,6 +27,15 @@ msgstr "Mapa \"{{- name}}\" je uložena."
msgid "Failed to save map: {{message}}"
msgstr "Nepodařilo se uložit mapu: {{message}}"

msgid "Calculation"
msgstr "Výpočet"

msgid "No calculations found"
msgstr "Nenalezeny žádné výpočty"

msgid "Calculations can be created in the Data Visualizer app."
msgstr "Výpočty lze vytvářet v aplikaci Data Visualizer."

msgid "Classification"
msgstr "Klasifikace"

Expand Down Expand Up @@ -485,6 +494,9 @@ msgstr "Položka dat události je povinná"
msgid "Program indicator is required"
msgstr "Je vyžadován indikátor programu"

msgid "Calculation is required"
msgstr "Je vyžadován výpočet"

msgid "Period is required"
msgstr "Období je vyžadováno"

Expand All @@ -500,6 +512,9 @@ msgstr "Položky dat události"
msgid "Program indicators"
msgstr "Ukazatele programu"

msgid "Calculations"
msgstr "Výpočty"

msgid "Item type"
msgstr "Typ položky"

Expand Down Expand Up @@ -1453,6 +1468,9 @@ msgstr "Organizační jednotky"
msgid "Org unit layer"
msgstr ""

msgid "Data item was not found"
msgstr ""

msgid "Thematic layer"
msgstr "Tematická vrstva"

Expand Down
22 changes: 20 additions & 2 deletions i18n/es.po
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@
# Carlos Tejo Alonso, 2022
# Marta Vila <marta@dhis2.org>, 2023
# Alejandra Avila <alejandra@dhis2.org>, 2023
# Enzo Nicolas Rossi <enzo@dhis2.org>, 2024
# Pablo Del Médico, 2024
# Viktor Varland <viktor@dhis2.org>, 2024
# Gabriela Rodriguez <grodriguezcoronado@gmail.com>, 2024
# Enzo Nicolas Rossi <enzo@dhis2.org>, 2024
# Janeth Cruz, 2024
#
msgid ""
msgstr ""
"Project-Id-Version: i18next-conv\n"
"POT-Creation-Date: 2024-07-29T08:57:17.532Z\n"
"POT-Creation-Date: 2024-09-24T14:47:22.063Z\n"
"PO-Revision-Date: 2019-06-25 18:35+0000\n"
"Last-Translator: Janeth Cruz, 2024\n"
"Language-Team: Spanish (https://app.transifex.com/hisp-uio/teams/100509/es/)\n"
Expand All @@ -40,6 +40,15 @@ msgstr "El mapa \"{{- name}}\" está guardado."
msgid "Failed to save map: {{message}}"
msgstr "Error al guardar el mapa: {{message}}"

msgid "Calculation"
msgstr "Cálculo"

msgid "No calculations found"
msgstr "No se encontraron cálculos"

msgid "Calculations can be created in the Data Visualizer app."
msgstr ""

msgid "Classification"
msgstr "Clasificación"

Expand Down Expand Up @@ -508,6 +517,9 @@ msgstr "Se requiere el dato de evento"
msgid "Program indicator is required"
msgstr "Se requiere indicador de programa"

msgid "Calculation is required"
msgstr ""

msgid "Period is required"
msgstr "Período requerido"

Expand All @@ -523,6 +535,9 @@ msgstr "Datos de eventos"
msgid "Program indicators"
msgstr "Indicadores de programa"

msgid "Calculations"
msgstr "Cálculos"

msgid "Item type"
msgstr "Item type"

Expand Down Expand Up @@ -1488,6 +1503,9 @@ msgstr "Unidades organizativas"
msgid "Org unit layer"
msgstr ""

msgid "Data item was not found"
msgstr ""

msgid "Thematic layer"
msgstr "Capa temática"

Expand Down
23 changes: 21 additions & 2 deletions i18n/fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,14 @@
# Viktor Varland <viktor@dhis2.org>, 2024
# Gabriela Rodriguez <grodriguezcoronado@gmail.com>, 2024
# Yao Selom SAKA (HISP WCA) <ysaka@hispwca.org>, 2024
# Elise Desailly, 2024
#
msgid ""
msgstr ""
"Project-Id-Version: i18next-conv\n"
"POT-Creation-Date: 2024-07-29T08:57:17.532Z\n"
"POT-Creation-Date: 2024-09-24T14:47:22.063Z\n"
"PO-Revision-Date: 2019-06-25 18:35+0000\n"
"Last-Translator: Yao Selom SAKA (HISP WCA) <ysaka@hispwca.org>, 2024\n"
"Last-Translator: Elise Desailly, 2024\n"
"Language-Team: French (https://app.transifex.com/hisp-uio/teams/100509/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand All @@ -38,6 +39,15 @@ msgstr ""
msgid "Failed to save map: {{message}}"
msgstr ""

msgid "Calculation"
msgstr ""

msgid "No calculations found"
msgstr "Aucun calcul trouvé"

msgid "Calculations can be created in the Data Visualizer app."
msgstr ""

msgid "Classification"
msgstr "Classification"

Expand Down Expand Up @@ -500,6 +510,9 @@ msgstr "L'élément de données évènement est requis"
msgid "Program indicator is required"
msgstr "L'indicateur de programme est requis"

msgid "Calculation is required"
msgstr ""

msgid "Period is required"
msgstr "La période est requise"

Expand All @@ -515,6 +528,9 @@ msgstr "Eléments de données évènement"
msgid "Program indicators"
msgstr "Program indicators"

msgid "Calculations"
msgstr ""

msgid "Item type"
msgstr "Type d'élément"

Expand Down Expand Up @@ -1482,6 +1498,9 @@ msgstr "Unités d'organisation"
msgid "Org unit layer"
msgstr ""

msgid "Data item was not found"
msgstr ""

msgid "Thematic layer"
msgstr "Thématique"

Expand Down
Loading

0 comments on commit a3eb864

Please sign in to comment.