From 11d5e4b92487eec1c16e6e913f7d6c28034d428d Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Mon, 6 Nov 2023 11:45:15 +0000 Subject: [PATCH 01/13] chore(release): cut 100.0.4 [skip release] ## [100.0.4](https://github.com/dhis2/dashboard-app/compare/v100.0.3...v100.0.4) (2023-11-06) ### Bug Fixes * **translations:** sync translations from transifex (dev) ([9ebfa9f](https://github.com/dhis2/dashboard-app/commit/9ebfa9f06342d04dea506d146f0b686dea25e23e)) * **translations:** sync translations from transifex (dev) ([9c6c0c6](https://github.com/dhis2/dashboard-app/commit/9c6c0c65a20852fd0f1187cc5a359c9180d5b43b)) * **translations:** sync translations from transifex (dev) ([31fc356](https://github.com/dhis2/dashboard-app/commit/31fc356ff3fa0087cd8b91bfd9644e443b1e7c63)) * **translations:** sync translations from transifex (dev) ([b9e9499](https://github.com/dhis2/dashboard-app/commit/b9e9499e4c9a45071599338aecbcf75c8e3c0f14)) * **translations:** sync translations from transifex (dev) ([3fbcee7](https://github.com/dhis2/dashboard-app/commit/3fbcee74a5f6f12127f71770ae892ffb11a3a189)) --- CHANGELOG.md | 11 +++++++++++ package.json | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 95b3f34ae..df5bc4ff1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ +## [100.0.4](https://github.com/dhis2/dashboard-app/compare/v100.0.3...v100.0.4) (2023-11-06) + + +### Bug Fixes + +* **translations:** sync translations from transifex (dev) ([9ebfa9f](https://github.com/dhis2/dashboard-app/commit/9ebfa9f06342d04dea506d146f0b686dea25e23e)) +* **translations:** sync translations from transifex (dev) ([9c6c0c6](https://github.com/dhis2/dashboard-app/commit/9c6c0c65a20852fd0f1187cc5a359c9180d5b43b)) +* **translations:** sync translations from transifex (dev) ([31fc356](https://github.com/dhis2/dashboard-app/commit/31fc356ff3fa0087cd8b91bfd9644e443b1e7c63)) +* **translations:** sync translations from transifex (dev) ([b9e9499](https://github.com/dhis2/dashboard-app/commit/b9e9499e4c9a45071599338aecbcf75c8e3c0f14)) +* **translations:** sync translations from transifex (dev) ([3fbcee7](https://github.com/dhis2/dashboard-app/commit/3fbcee74a5f6f12127f71770ae892ffb11a3a189)) + ## [100.0.3](https://github.com/dhis2/dashboard-app/compare/v100.0.2...v100.0.3) (2023-09-13) diff --git a/package.json b/package.json index f4ab14107..72f77c7f2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dashboard-app", - "version": "100.0.3", + "version": "100.0.4", "description": "DHIS2 Dashboard app", "private": true, "license": "BSD-3-Clause", From 0b0c7cff10eef5035ac5e1b53406a7f2e5f66912 Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Sun, 26 Nov 2023 02:38:09 +0100 Subject: [PATCH 02/13] fix(translations): sync translations from transifex (dev) Automatically merged. --- i18n/cs.po | 41 ++++++++++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/i18n/cs.po b/i18n/cs.po index fa3f0ab18..9962638fb 100644 --- a/i18n/cs.po +++ b/i18n/cs.po @@ -1,14 +1,14 @@ # # Translators: -# trendspotter , 2021 +# Jiří Podhorecký, 2023 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2021-12-21T08:20:25.327Z\n" +"POT-Creation-Date: 2023-05-03T11:08:21.315Z\n" "PO-Revision-Date: 2019-06-25 12:37+0000\n" -"Last-Translator: trendspotter , 2021\n" -"Language-Team: Czech (https://www.transifex.com/hisp-uio/teams/100509/cs/)\n" +"Last-Translator: Jiří Podhorecký, 2023\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" "Content-Transfer-Encoding: 8bit\n" @@ -72,6 +72,12 @@ msgstr "Textová položka" msgid "Add text here" msgstr "Sem přidat text" +msgid "Filters are not applied to line list dashboard items" +msgstr "Filtry se nepoužívají na položky ovládacího panelu řádkového seznamu" + +msgid "Filters not applied" +msgstr "Filtry nejsou použity" + msgid "There was a problem loading this dashboard item" msgstr "Při načítání této položky ovládacího panelu došlo k problému" @@ -105,15 +111,33 @@ msgstr "Zobrazit jako mapu" msgid "There was a problem loading interpretations for this item" msgstr "Při načítání interpretací této položky došlo k problému" +msgid "The plugin for rendering this item is not available" +msgstr "Plugin pro vykreslení této položky není k dispozici" + +msgid "Install the {{appName}} app from the App Hub" +msgstr "Nainstalujte si aplikaci {{appName}} z App Hub" + +msgid "No data to display" +msgstr "Žádná data k zobrazení" + +msgid "" +"Install Line Listing app version ${minLLVersion.join(\n" +" '.'\n" +" )} or higher in order to display this item." +msgstr "" +"Nainstalovat aplikaci Line Listing verze ${minLLVersion.join(\n" +" '.'\n" +" )} nebo vyšší pro zobrazení této položky." + +msgid "Show without filters" +msgstr "Zobrazit bez filtrů" + msgid "Maps with Earth Engine layers cannot be displayed when offline" msgstr "Mapy s vrstvami Earth Engine nelze zobrazit v režimu offline" msgid "Unable to load the plugin for this item" msgstr "Nelze načíst plugin pro tuto položku" -msgid "No data to display" -msgstr "Žádná data k zobrazení" - msgid "There was an error loading data for this item" msgstr "Při načítání dat této položky došlo k chybě" @@ -141,6 +165,9 @@ msgstr "Zprávy o událostech" msgid "Event charts" msgstr "Grafy událostí" +msgid "Line lists" +msgstr "" + msgid "Apps" msgstr "Aplikace" From 6a22f0868e6091dbfba07df32abf2afeb08fa08d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Henrik=20=C3=98verland?= Date: Thu, 14 Dec 2023 16:17:20 +0100 Subject: [PATCH 03/13] chore: analytics (#2856) * chore: 26.2.0-cumulative-values-alpha.1 * chore: analytics@26.2.0 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 72f77c7f2..bd5cf52cb 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "private": true, "license": "BSD-3-Clause", "dependencies": { - "@dhis2/analytics": "^26.0.17", + "@dhis2/analytics": "^26.2.0", "@dhis2/app-runtime": "^3.9.4", "@dhis2/app-runtime-adapter-d2": "^1.1.0", "@dhis2/d2-i18n": "^1.1.1", diff --git a/yarn.lock b/yarn.lock index b6b4e5627..e0fdfd349 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2158,10 +2158,10 @@ classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2/analytics@^26.0.17": - version "26.0.17" - resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-26.0.17.tgz#f6f550c266478c38872429ee422f6a890b189a82" - integrity sha512-681OmaLrAetgHL59iU9ldeaXZ7NLp5T3nWLxGQGAklUwCpmny32wJKj2aXsCQN6WYuGDvz9PgpqN+YrkAMChFQ== +"@dhis2/analytics@^26.2.0": + version "26.2.0" + resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-26.2.0.tgz#36a7f258ac96ddab90f4001e62257e2cc64f202e" + integrity sha512-YcJu6EHnor6pbHmwXKYumLRVy/9TxuLtBDv9JIzjt9/APZa8kbak6sT2/53pnWDnbUjzDwR8EV1UIz24vAX+ig== dependencies: "@dhis2/d2-ui-rich-text" "^7.4.1" "@dhis2/multi-calendar-dates" "1.0.0" From 9d83c09ddd720a993a2eef9a820ba6914da9d20d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Dec 2023 15:18:27 +0000 Subject: [PATCH 04/13] chore(deps): bump @adobe/css-tools from 4.3.1 to 4.3.2 Bumps [@adobe/css-tools](https://github.com/adobe/css-tools) from 4.3.1 to 4.3.2. - [Changelog](https://github.com/adobe/css-tools/blob/main/History.md) - [Commits](https://github.com/adobe/css-tools/commits) --- updated-dependencies: - dependency-name: "@adobe/css-tools" dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index e0fdfd349..10f0e73f5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3,9 +3,9 @@ "@adobe/css-tools@^4.3.0": - version "4.3.1" - resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.3.1.tgz#abfccb8ca78075a2b6187345c26243c1a0842f28" - integrity sha512-/62yikz7NLScCGAAST5SHdnjaDJQBDq0M2muyRTpf2VQhw6StBg2ALiu73zSJQ4fMVLA+0uBhBHAle7Wg+2kSg== + version "4.3.2" + resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.3.2.tgz#a6abc715fb6884851fca9dad37fc34739a04fd11" + integrity sha512-DA5a1C0gD/pLOvhv33YMrbf2FK3oUzwNl9oOJqE4XVjuEtt6XIakRcsd7eLiOSPkp1kTRQGICTA8cKra/vFbjw== "@ampproject/remapping@^2.1.0": version "2.2.0" From db5128acc043ac56d1a8be60c70216fc1ecec418 Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Sun, 17 Dec 2023 02:38:51 +0100 Subject: [PATCH 05/13] fix(translations): sync translations from transifex (dev) Automatically merged. --- i18n/uz_UZ_Cyrl.po | 169 ++++++++++++++++++++++++++------------------- 1 file changed, 99 insertions(+), 70 deletions(-) diff --git a/i18n/uz_UZ_Cyrl.po b/i18n/uz_UZ_Cyrl.po index b5375c94a..5596e92c3 100644 --- a/i18n/uz_UZ_Cyrl.po +++ b/i18n/uz_UZ_Cyrl.po @@ -1,13 +1,13 @@ # # Translators: -# Ibatov , 2021 +# Ibatov , 2023 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" "POT-Creation-Date: 2023-05-03T11:08:21.315Z\n" "PO-Revision-Date: 2019-06-25 12:37+0000\n" -"Last-Translator: Ibatov , 2021\n" +"Last-Translator: Ibatov , 2023\n" "Language-Team: Uzbek (Cyrillic) (https://app.transifex.com/hisp-uio/teams/100509/uz@Cyrl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,22 +19,22 @@ msgid "Untitled dashboard" msgstr "Номсиз бошқарув панели" msgid "Cannot create a dashboard while offline" -msgstr "" +msgstr "Автоном режимда мониторинг панелини яратиб бўлмади" msgid "Create new dashboard" -msgstr "" +msgstr "Янги мониторинг панелини яратиш" msgid "Search for a dashboard" msgstr "Бошқариш панелида излаш" msgid "Show fewer dashboards" -msgstr "" +msgstr "Камроқ мониторинг панелини кўрсатиш" msgid "Show more dashboards" -msgstr "" +msgstr "Кўпроқ мониторинг панелини кўрсатиш" msgid "Remove this item" -msgstr "" +msgstr "Ушбу элементни олиб ташлаш" msgid "This item has been shortened to fit on one page" msgstr "Ушбу элемент бир саҳифага жойлаштириш учун мослаштирилди" @@ -49,10 +49,10 @@ msgid "See all messages" msgstr "Барча хабарларни кўриш" msgid "Item type \"{{type}}\" is not supported" -msgstr "" +msgstr "Элемент тури \"{{type}}\" қўллаб қувватланмади" msgid "The item type is missing" -msgstr "" +msgstr "Элемент тури мавжуд эмас" msgid "Filters applied" msgstr "Фильтр қўлланилди" @@ -74,33 +74,34 @@ msgstr "Матнни шу ерга қўшинг" msgid "Filters are not applied to line list dashboard items" msgstr "" +"Мониторинг панели элементлари қатори рўйхати учун фильтр қўллаб бўлмади" msgid "Filters not applied" -msgstr "" +msgstr "Фильтрлар қўлланилмади" msgid "There was a problem loading this dashboard item" msgstr "Ушбу панел элементлари юкланишида муаамога дуч келинди" msgid "Hide details and interpretations" -msgstr "" +msgstr "Деталлар ва тавсифларни яшириш" msgid "Show details and interpretations" -msgstr "" +msgstr "Деталлар ва тавсифларни кўрсатиш" msgid "Open in {{appName}} app" msgstr "Иловада {{ИловаНоми}} да очиш" msgid "View fullscreen" -msgstr "" +msgstr "Экранни тўлдириб кўрсатиш" msgid "This map can't be displayed as a chart" -msgstr "" +msgstr "Ушбу харитани диаграмма сифатида кўрсатиб бўлмайди" msgid "View as Chart" msgstr "Диаграмма сифатида кўриш" msgid "This map can't be displayed as a table" -msgstr "" +msgstr "Ушбу харитани жадвал сифатида кўратиб бўлмайди" msgid "View as Table" msgstr "Жадвал сифатида кўриш" @@ -109,13 +110,13 @@ msgid "View as Map" msgstr "Харита сифатида кўриш" msgid "There was a problem loading interpretations for this item" -msgstr "" +msgstr "Ушбу элемент тавсифини юклашда хатолик юз берди" msgid "The plugin for rendering this item is not available" -msgstr "" +msgstr "Ушбу элементни кўрсатиш учун плагин мавжуд эмас" msgid "Install the {{appName}} app from the App Hub" -msgstr "" +msgstr "App Hub дан {{appName}} иловасини ўрнатинг" msgid "No data to display" msgstr "Маълумот экранга чиқарилмади" @@ -125,21 +126,25 @@ msgid "" " '.'\n" " )} or higher in order to display this item." msgstr "" +"Ушбу элементни кўрсатиш учун Line Listing иловасининг ${minLLVersion.join( " +"'.' )} ёки юқори версиясини ўрнатинг." msgid "Show without filters" -msgstr "" +msgstr "Фильтрларсиз кўрсатиш" msgid "Maps with Earth Engine layers cannot be displayed when offline" msgstr "" +"Оффлайн ҳолатда Earth Engine қаватлари ва хариталарни экранда кўрсатиш " +"имкони мавжуд эмас" msgid "Unable to load the plugin for this item" msgstr "Ушбу элемент учун плагин юкланмади" msgid "There was an error loading data for this item" -msgstr "" +msgstr "Ушбу элемент маълумотларини юклашда хатолик юз берди" msgid "Open this item in {{appName}}" -msgstr "" +msgstr " {{appName}}да ушбу элементни очмоқ" msgid "Not available offline" msgstr "Оффлайн режимда мавжуд эмас" @@ -163,7 +168,7 @@ msgid "Event charts" msgstr "Ҳодисалар диаграммаларда" msgid "Line lists" -msgstr "" +msgstr "Қаторлар рўйхати" msgid "Apps" msgstr "Илова" @@ -180,20 +185,21 @@ msgstr "Фойдаланувчилар" msgid "" "Failed to save dashboard. You might be offline or not have access to edit " "this dashboard." -msgstr "" +msgstr "Бошқарув панели сақланмади. Сиз оффлайн ёки бу ҳуқуқга эга эмассиз." msgid "" "Failed to save dashboard. This code is already being used on another " "dashboard." msgstr "" +"Бошқарув панели сақланмади. Бу код аллақачон асбоблар панелида ишлатилмоқда." msgid "" "Failed to delete dashboard. You might be offline or not have access to edit " "this dashboard." -msgstr "" +msgstr "Бошқарув панели ўчирилмади. Сиз оффлайн ёки бу ҳуқуқга эга эмассиз." msgid "Cannot save this dashboard while offline" -msgstr "" +msgstr "Офллайн режимда ушбу панел сақланмади" msgid "Save changes" msgstr "Ўзгартиришни сақлаш" @@ -205,13 +211,13 @@ msgid "Print preview" msgstr "Чоп этишдан аввалги кўрик" msgid "Filter settings" -msgstr "" +msgstr "Фильтр созламалари" msgid "Translate" msgstr "Таржима қилинг" msgid "Cannot delete this dashboard while offline" -msgstr "" +msgstr "Офллайн режимда ушбу панел ўчирилмади" msgid "Delete" msgstr "Ўчириб ташлаш" @@ -245,32 +251,36 @@ msgid "" "This dashboard has unsaved changes. Are you sure you want to leave and " "discard these unsaved changes?" msgstr "" +"Ушбу асбоблар панелида сақланмаган ўзгартиришлар мавжуд. Ҳақиқатдан ҳам ушбу" +" сақланмаган ўзгартиришларни тарк этиш ва бекор қилишни хохлайсизми?" msgid "No, stay here" msgstr "Йўқ, саҳифада қолиш" msgid "Yes, discard changes" -msgstr "" +msgstr "Ҳа, ўзгартиришлар бекор қилинсин" msgid "No access" msgstr "Кириш ҳуқуқи мавжуд эмас" msgid "Not supported" -msgstr "" +msgstr "Қўллаб қувватланмади" msgid "" "Editing dashboards on small screens is not supported. Resize your screen to " "return to edit mode." msgstr "" +"Кичрайтирилган экранда асбоблар панелини ўзгартириш қўллаб қувватланмайди. " +"Таҳрирлаш режимига ўтиш учун экран ўлчамини ўзгартиринг." msgid "Allow filtering by all dimensions" -msgstr "" +msgstr "Барча ўлчамлар бўйича фильтрлашга рухсат бериш" msgid "Only allow filtering by selected dimensions" -msgstr "" +msgstr "Фақат танланган ўлчамлар бўйича фильтрлашга ручсат бериш" msgid "Dashboard filter settings" -msgstr "" +msgstr "Бошқарув панели фильтр созламалари" msgid "" "Dashboards can be filtered by dimensions to change\n" @@ -278,12 +288,16 @@ msgid "" " as filters. Alternatively, only selected dimensions can\n" " be made available on a dashboard." msgstr "" +"Кўрсатиладиган маълумотларни ўзгартириш учун асбоблар панелида ўлчамлар " +"бўйича фильтрлаш мумкин. Одатда балча ўлчамлар фильтрлаш учун " +"мослаштирилган. Алтернатив шаклда асбоблар панелида фақат танланганлар учун " +"фильтр созлаш мумкин." msgid "Available Filters" -msgstr "" +msgstr "Мавжуд фильтрлар" msgid "Selected Filters" -msgstr "" +msgstr "Танланган фильтрлар" msgid "Confirm" msgstr "Тасдиқланг" @@ -304,10 +318,10 @@ msgid "Search for items to add to this dashboard" msgstr "Ушбу бошқарув панелига киритиш учун элементларни қидиринг" msgid "Search for visualizations, reports and more" -msgstr "" +msgstr "Визуализация, ҳисобот ва бошқалар учун излаш" msgid "Cannot search for dashboard items while offline" -msgstr "" +msgstr "Офллайн режимда асбоблар панели элементларини излаш имконсиз" msgid "Additional items" msgstr "Қўшимча элементлар" @@ -319,44 +333,50 @@ msgid "Dashboard layout" msgstr "Бошқарув панели макети" msgid "Freeflow" -msgstr "" +msgstr "Эркин оқим" msgid "Dashboard items can be placed anywhere, at any size." msgstr "" +"Ахборот панели элементларини хохлаган жойда ва ўлчамда жойлаштириш мумкин" msgid "Fixed columns" -msgstr "" +msgstr "Белгиланган устунлар" msgid "" "Dashboard items are automatically placed within fixed, horizontal columns. " "The number of columns can be adjusted." msgstr "" +"Бошқарув панели элементлари автоматик равишда горизонтал устунлар ичида " +"жойлаштирилади. Устунлар сонини созлаш мумкин." msgid "Number of columns" -msgstr "" +msgstr "Устунлар сони" msgid "Gap size between columns (px)" -msgstr "" +msgstr "Устунлар орасидаги масофа ўлчами (px)" msgid "" "Default height only applies to items added to a dashboard, this setting will" " not change existing items" msgstr "" +"Баландлик стандарт ҳолатда фақатгина мониторинг панелига қўшилган " +"элементларга қўлланилади; бу параметр мавжуд элементларни ўзгартирмайди." msgid "Default height for items added to dashboard (rows)" msgstr "" +"Мониторинг панелига қўшилган элементлар учун стандарт баландлик (сатрлар)" msgid "Save layout" -msgstr "" +msgstr "Макетни сақлаш" msgid "Dashboard title" msgstr "Бошқарув панели номланиши" msgid "Dashboard code" -msgstr "" +msgstr "Бошқарув панели коди" msgid "Code can't be longer than 50 characters" -msgstr "" +msgstr "Код 50 та белгидан ошмаслиги керак" msgid "Dashboard description" msgstr "Бошқарув панели тавсифи" @@ -366,19 +386,19 @@ msgstr "Жойлашиш тартиби" msgid "{{count}} columns" msgid_plural "{{count}} columns" -msgstr[0] "" +msgstr[0] "{{count}} устунлар" msgid "Change layout" -msgstr "" +msgstr "Макетни ўзгартириш" msgid "Add new items to" -msgstr "" +msgstr "Янги элементни қўшиш" msgid "End of dashboard" -msgstr "" +msgstr "Бошқарув панели охири" msgid "Start of dashboard" -msgstr "" +msgstr "Бошқарув панели боши" msgid "Print" msgstr "Чоп этиш" @@ -407,23 +427,27 @@ msgid "" "Use A4 landscape paper size, default margin settings and turn on background " "graphics in the browser print dialog" msgstr "" +"Браузернинг принт диалог саҳифасида қўдданг; А4 қоғоз альбом варианти, " +"чегаралр стандарт созламалари ва фон графикасини ёқинг." msgid "Getting started" msgstr "Иш бошланганида" msgid "Search for and open saved dashboards from the top bar." -msgstr "" +msgstr "Информацион панелининг юқори қисмидан изланг ва очинг." msgid "" "Click a dashboard chip to open it. Get back to this screen from the \"More\"" " menu." msgstr "" +"Асбоблар панелини очиш учун босинг. Бу энранга менюдаги \"Яна\" тугмаси " +"орқали қайтинг." msgid "Create a new dashboard with the + button." -msgstr "" +msgstr "Янги бошқарув панели + тугмаси орқали яратинг." msgid "Your most viewed dashboards" -msgstr "" +msgstr "Сизнинг энг кўп кўрилган ахборот панелларингиз" msgid "No dashboards found. Use the + button to create a new dashboard." msgstr "" @@ -438,39 +462,42 @@ msgid_plural "{{count}} selected" msgstr[0] "{{жами}} танланган" msgid "Cannot remove filters while offline" -msgstr "" +msgstr "Офллайн режимда фильтрни ўчириб бўлмайди" msgid "Removing filters while offline" -msgstr "" +msgstr "Оффлайн режимда фильтрни ўчириш" msgid "" "Removing this filter while offline will remove all other filters. Do you " "want to remove all filters on this dashboard?" msgstr "" +"Ушбу фильтрни оффлайн режимда ўчириш, барча фильтрларни ўчирилишига олиб " +"келади. Сиз барча фильтрларни ахборот панелидан ўчиришни хохлайсизми?" msgid "No, cancel" msgstr "Йўқ, бекор қилинг" msgid "Yes, remove filters" -msgstr "" +msgstr "Ҳа, фильтрларни ўчириш" msgid "The dashboard couldn't be made available offline. Try again." msgstr "" +"Бошқарув панелини оффлайн режимда ишлатиб бўлмади. Қайта уриниб кўринг." msgid "Failed to unstar the dashboard" -msgstr "" +msgstr "Бошқарув панелидаги белги олиб ташланмади" msgid "Failed to star the dashboard" -msgstr "" +msgstr "Бошқарув панелида белги қўйиб бўлмади" msgid "Remove from offline storage" -msgstr "" +msgstr "Оффлайн базасидан олиб ташлаш" msgid "Make available offline" -msgstr "" +msgstr "Оффлайн режимида фойдаланиш мумкин" msgid "Sync offline data now" -msgstr "" +msgstr "Маълумотларни оффлайн режимда синхронлаш" msgid "Unstar dashboard" msgstr "Бошқарув панелидаги юлдузча ўчирилади" @@ -488,7 +515,7 @@ msgid "One item per page" msgstr "Ҳар бир саҳифада битта элемент" msgid "Close dashboard" -msgstr "" +msgstr "Бошқарув панелини ёпиш" msgid "More" msgstr "Кўпроқ" @@ -500,15 +527,17 @@ msgid "Share" msgstr "Улашиш" msgid "Clear dashboard filters?" -msgstr "" +msgstr "Бошқарув панели фильтрларини тозалаш керакми?" msgid "" "A dashboard's filters can’t be saved offline. Do you want to remove the " "filters and make this dashboard available offline?" msgstr "" +"Бошқарув панели фильтрларини оффлайн режимда сақлаш имконсиз. Фильтрларни " +"олиб ташлаб, бу асбоблар панелидан оффлайн режимда фойдаланишни хохлайсизми?" msgid "Yes, clear filters and sync" -msgstr "" +msgstr "Ҳа, фильтрни ва синхронлашни тозалаш" msgid "No description" msgstr "Тавсиф йўқ" @@ -517,31 +546,31 @@ msgid "Add filter" msgstr "Фильтр киритиш" msgid "Offline data last updated {{time}}" -msgstr "" +msgstr "Оффлайн режимда охирги марта янгиланган маълумотлар {{time}}" msgid "Cannot unstar this dashboard while offline" -msgstr "" +msgstr "Оффлайн режимда бошқарув панелида белгиларни ўчириб бўлмайди" msgid "Cannot star this dashboard while offline" -msgstr "" +msgstr "Оффлайн режимда бошқарув панелида белгилар қўйиб бўлмайди" msgid "Loading dashboard – {{name}}" msgstr "Бошқарув панели юкланмоқда - {{исми}}" msgid "Loading dashboard" -msgstr "" +msgstr "Бошқарув панели юкланмоқда" msgid "Offline" msgstr "Оффлайн" msgid "This dashboard cannot be loaded while offline." -msgstr "" +msgstr "Бошқарув панелини оффлайн режимда юклаб бўлмайди" msgid "Go to start page" -msgstr "" +msgstr "Бошланғич саҳифага ўтиш" msgid "Load dashboard failed" -msgstr "" +msgstr "Бошқарув панели юкланмади" msgid "This dashboard could not be loaded. Please try again later." -msgstr "" +msgstr "Бошқарув панели юкланмади. Илтимос, кейинроқ қайта уриниб кўринг" From 4d43b23010efc4ffc9f731be66793abd8c6c467c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jan 2024 09:59:16 +0100 Subject: [PATCH 06/13] chore(deps): bump browserify-sign from 4.2.1 to 4.2.2 (#2807) Bumps [browserify-sign](https://github.com/crypto-browserify/browserify-sign) from 4.2.1 to 4.2.2. - [Changelog](https://github.com/browserify/browserify-sign/blob/main/CHANGELOG.md) - [Commits](https://github.com/crypto-browserify/browserify-sign/compare/v4.2.1...v4.2.2) --- updated-dependencies: - dependency-name: browserify-sign dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jen Jones Arnesen --- yarn.lock | 40 +++++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/yarn.lock b/yarn.lock index 10f0e73f5..6ed92f89e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4902,11 +4902,16 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9: resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA== -bn.js@^5.0.0, bn.js@^5.1.1: +bn.js@^5.0.0: version "5.2.0" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz#358860674396c6997771a9d051fcc1b57d4ae002" integrity sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw== +bn.js@^5.2.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.1.tgz#0bc527a6a0d18d0aa8d5b0538ce4a77dccfa7b70" + integrity sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ== + body-parser@1.20.0: version "1.20.0" resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.0.tgz#3de69bd89011c11573d7bfee6a64f11b6bd27cc5" @@ -5076,7 +5081,7 @@ browserify-des@^1.0.0: inherits "^2.0.1" safe-buffer "^5.1.2" -browserify-rsa@^4.0.0, browserify-rsa@^4.0.1: +browserify-rsa@^4.0.0, browserify-rsa@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz#b2fd06b5b75ae297f7ce2dc651f918f5be158c8d" integrity sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog== @@ -5085,19 +5090,19 @@ browserify-rsa@^4.0.0, browserify-rsa@^4.0.1: randombytes "^2.0.1" browserify-sign@^4.0.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz#eaf4add46dd54be3bb3b36c0cf15abbeba7956c3" - integrity sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg== + version "4.2.2" + resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.2.tgz#e78d4b69816d6e3dd1c747e64e9947f9ad79bc7e" + integrity sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg== dependencies: - bn.js "^5.1.1" - browserify-rsa "^4.0.1" + bn.js "^5.2.1" + browserify-rsa "^4.1.0" create-hash "^1.2.0" create-hmac "^1.1.7" - elliptic "^6.5.3" + elliptic "^6.5.4" inherits "^2.0.4" - parse-asn1 "^5.1.5" - readable-stream "^3.6.0" - safe-buffer "^5.2.0" + parse-asn1 "^5.1.6" + readable-stream "^3.6.2" + safe-buffer "^5.2.1" browserify-zlib@~0.2.0: version "0.2.0" @@ -7210,7 +7215,7 @@ elegant-spinner@^1.0.1: resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e" integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4= -elliptic@^6.5.3: +elliptic@^6.5.3, elliptic@^6.5.4: version "6.5.4" resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb" integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ== @@ -12185,7 +12190,7 @@ parents@^1.0.0, parents@^1.0.1: dependencies: path-platform "~0.11.15" -parse-asn1@^5.0.0, parse-asn1@^5.1.5: +parse-asn1@^5.0.0, parse-asn1@^5.1.6: version "5.1.6" resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz#385080a3ec13cb62a62d39409cb3e88844cdaed4" integrity sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw== @@ -13665,6 +13670,15 @@ readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable string_decoder "~1.1.1" util-deprecate "~1.0.1" +readable-stream@^3.6.2: + version "3.6.2" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" + integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + readdirp@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525" From 3518e6451130cb9439d55b57abf353c8fc3dc8c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jan 2024 09:59:41 +0100 Subject: [PATCH 07/13] chore(deps): bump crypto-js from 4.1.1 to 4.2.0 (#2806) Bumps [crypto-js](https://github.com/brix/crypto-js) from 4.1.1 to 4.2.0. - [Commits](https://github.com/brix/crypto-js/compare/4.1.1...4.2.0) --- updated-dependencies: - dependency-name: crypto-js dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jen Jones Arnesen --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 6ed92f89e..dfcf04c85 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6245,9 +6245,9 @@ crypto-browserify@^3.0.0: randomfill "^1.0.3" crypto-js@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.1.1.tgz#9e485bcf03521041bd85844786b83fb7619736cf" - integrity sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw== + version "4.2.0" + resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.2.0.tgz#4d931639ecdfd12ff80e8186dba6af2c2e856631" + integrity sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q== crypto-random-string@^1.0.0: version "1.0.0" From 166186bbf93fc5fce8ce0c30f1d8488480cb10b6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jan 2024 10:00:06 +0100 Subject: [PATCH 08/13] chore(deps): bump get-func-name from 2.0.0 to 2.0.2 (#2748) Bumps [get-func-name](https://github.com/chaijs/get-func-name) from 2.0.0 to 2.0.2. - [Release notes](https://github.com/chaijs/get-func-name/releases) - [Commits](https://github.com/chaijs/get-func-name/commits/v2.0.2) --- updated-dependencies: - dependency-name: get-func-name dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jen Jones Arnesen --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index dfcf04c85..93972cb82 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8517,9 +8517,9 @@ get-caller-file@^2.0.1, get-caller-file@^2.0.5: integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== get-func-name@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41" - integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE= + version "2.0.2" + resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.2.tgz#0d7cf20cd13fda808669ffa88f4ffc7a3943fc41" + integrity sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ== get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0: version "1.2.0" From 34bf16e30ff864d6b560b7db16d5e53893493aff Mon Sep 17 00:00:00 2001 From: Jen Jones Arnesen Date: Tue, 23 Jan 2024 10:01:54 +0100 Subject: [PATCH 09/13] chore: use the repo default branch for dependabot (#2887) --- .github/dependabot.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index ce57a13d7..51a5c167d 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,5 +5,4 @@ updates: schedule: interval: weekly open-pull-requests-limit: 10 - target-branch: master versioning-strategy: increase From 252a0cf3dc286c8c808eaa3ef517322f5ef5b60e Mon Sep 17 00:00:00 2001 From: Jen Jones Arnesen Date: Tue, 23 Jan 2024 10:54:00 +0100 Subject: [PATCH 10/13] chore: include patch packages in cache-key (#2855) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Related to https://dhis2.atlassian.net/browse/LIBS-383 Add package patches to the yarn cache key. If a new patch is added, then this ensures that that the yarn cache gets invalidated and forces yarn install, which will then do the postinstall step that applies the patches. From user perspective, the e2e-prod tests might fail if it is depending on a patch that didn't get installed. Co-authored-by: Jan Henrik Øverland --- .github/workflows/dhis2-verify-app.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dhis2-verify-app.yml b/.github/workflows/dhis2-verify-app.yml index 94079da06..76626630b 100644 --- a/.github/workflows/dhis2-verify-app.yml +++ b/.github/workflows/dhis2-verify-app.yml @@ -94,7 +94,7 @@ jobs: id: yarn-cache with: path: '**/node_modules' - key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} + key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('patches/*.patch') }} - name: End-to-End tests uses: cypress-io/github-action@v2 @@ -104,7 +104,7 @@ jobs: start: ${{ env.SERVER_START_CMD }} wait-on: ${{ env.SERVER_URL }} wait-on-timeout: 300 - cache-key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} + cache-key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('patches/*.patch') }} group: 'e2e' tag: ${{ github.event_name }} env: From b99c5ac972e64a3539770272766d19ffba8369ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jan 2024 10:54:38 +0100 Subject: [PATCH 11/13] chore(deps): bump react-redux from 7.2.4 to 7.2.9 (#2893) Bumps [react-redux](https://github.com/reduxjs/react-redux) from 7.2.4 to 7.2.9. - [Release notes](https://github.com/reduxjs/react-redux/releases) - [Changelog](https://github.com/reduxjs/react-redux/blob/master/CHANGELOG.md) - [Commits](https://github.com/reduxjs/react-redux/compare/v7.2.4...v7.2.9) --- updated-dependencies: - dependency-name: react-redux dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jen Jones Arnesen --- package.json | 2 +- yarn.lock | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index bd5cf52cb..8b16a1fd0 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "react": "^16.14.0", "react-dom": "^16.13.1", "react-grid-layout": "1.2.2", - "react-redux": "^7.2.4", + "react-redux": "^7.2.9", "react-router-dom": "^5.2.0", "redux": "^4.1.0", "redux-logger": "^3.0.6", diff --git a/yarn.lock b/yarn.lock index 93972cb82..2c47353d5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3645,10 +3645,10 @@ dependencies: "@types/react" "^17" -"@types/react-redux@^7.1.16": - version "7.1.18" - resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.18.tgz#2bf8fd56ebaae679a90ebffe48ff73717c438e04" - integrity sha512-9iwAsPyJ9DLTRH+OFeIrm9cAbIj1i2ANL3sKQFATqnPWRbg+jEFXyZOKHiQK/N86pNRXbb4HRxAxo0SIX1XwzQ== +"@types/react-redux@^7.1.20": + version "7.1.33" + resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.33.tgz#53c5564f03f1ded90904e3c90f77e4bd4dc20b15" + integrity sha512-NF8m5AjWCkert+fosDsN3hAlHzpjSiXlVy9EgQEmLoBhaNXbmyeGs/aj5dQzKuF+/q+S7JQagorGDW8pJ28Hmg== dependencies: "@types/hoist-non-react-statics" "^3.3.0" "@types/react" "*" @@ -13415,7 +13415,7 @@ react-is@^16.13.1, react-is@^16.6.0, react-is@^16.6.3, react-is@^16.7.0: resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== -react-is@^17.0.1: +react-is@^17.0.1, react-is@^17.0.2: version "17.0.2" resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== @@ -13467,17 +13467,17 @@ react-redux@^5.0.7: react-is "^16.6.0" react-lifecycles-compat "^3.0.0" -react-redux@^7.2.4: - version "7.2.4" - resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.4.tgz#1ebb474032b72d806de2e0519cd07761e222e225" - integrity sha512-hOQ5eOSkEJEXdpIKbnRyl04LhaWabkDPV+Ix97wqQX3T3d2NQ8DUblNXXtNMavc7DpswyQM6xfaN4HQDKNY2JA== +react-redux@^7.2.9: + version "7.2.9" + resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.9.tgz#09488fbb9416a4efe3735b7235055442b042481d" + integrity sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ== dependencies: - "@babel/runtime" "^7.12.1" - "@types/react-redux" "^7.1.16" + "@babel/runtime" "^7.15.4" + "@types/react-redux" "^7.1.20" hoist-non-react-statics "^3.3.2" loose-envify "^1.4.0" prop-types "^15.7.2" - react-is "^16.13.1" + react-is "^17.0.2" react-refresh@^0.11.0: version "0.11.0" From 56fcaa4f54db13cc5153643e689461f7af430abe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jan 2024 10:55:08 +0100 Subject: [PATCH 12/13] chore(deps): bump moment from 2.29.4 to 2.30.1 (#2892) Bumps [moment](https://github.com/moment/moment) from 2.29.4 to 2.30.1. - [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md) - [Commits](https://github.com/moment/moment/compare/2.29.4...2.30.1) --- updated-dependencies: - dependency-name: moment dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jen Jones Arnesen --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 8b16a1fd0..3bf7f9f76 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "d2-utilizr": "^0.2.16", "i18next": "^20.3.5", "lodash": "^4.17.21", - "moment": "^2.29.4", + "moment": "^2.30.1", "react": "^16.14.0", "react-dom": "^16.13.1", "react-grid-layout": "1.2.2", diff --git a/yarn.lock b/yarn.lock index 2c47353d5..700f8c8eb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11597,10 +11597,10 @@ module-deps@^6.0.0, module-deps@^6.2.3: through2 "^2.0.0" xtend "^4.0.0" -moment@^2.24.0, moment@^2.29.1, moment@^2.29.4: - version "2.29.4" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108" - integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w== +moment@^2.24.0, moment@^2.29.1, moment@^2.30.1: + version "2.30.1" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.30.1.tgz#f8c91c07b7a786e30c59926df530b4eac96974ae" + integrity sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how== ms@2.0.0: version "2.0.0" From 06e0eb3e9ee337a0dc704df07aa6f232ea9fe0d7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jan 2024 11:48:46 +0100 Subject: [PATCH 13/13] chore(deps): bump @dhis2/d2-i18n from 1.1.1 to 1.1.3 (#2896) Bumps [@dhis2/d2-i18n](https://github.com/dhis2/d2-i18n) from 1.1.1 to 1.1.3. - [Release notes](https://github.com/dhis2/d2-i18n/releases) - [Changelog](https://github.com/dhis2/d2-i18n/blob/master/CHANGELOG.md) - [Commits](https://github.com/dhis2/d2-i18n/compare/v1.1.1...v1.1.3) --- updated-dependencies: - dependency-name: "@dhis2/d2-i18n" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 3bf7f9f76..b71a87c0a 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "@dhis2/analytics": "^26.2.0", "@dhis2/app-runtime": "^3.9.4", "@dhis2/app-runtime-adapter-d2": "^1.1.0", - "@dhis2/d2-i18n": "^1.1.1", + "@dhis2/d2-i18n": "^1.1.3", "@dhis2/d2-ui-core": "^7.4.3", "@dhis2/d2-ui-interpretations": "^7.4.3", "@dhis2/d2-ui-mentions-wrapper": "^7.4.3", diff --git a/yarn.lock b/yarn.lock index 700f8c8eb..b220d78ad 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2376,11 +2376,12 @@ dependencies: jscodeshift "^0.11.0" -"@dhis2/d2-i18n@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@dhis2/d2-i18n/-/d2-i18n-1.1.1.tgz#acaca32cd00b60fd6b6f1dee571f2817a50e243c" - integrity sha512-X0jOCIKPaYv/2z0/sdkEvcbRiYu5o1FrOwvitiS6aKFxSL/GJ872I+UdHwpWJtL+yM7Z8E1epljazW0LnHUz0Q== +"@dhis2/d2-i18n@^1.1.1", "@dhis2/d2-i18n@^1.1.3": + version "1.1.3" + resolved "https://registry.yarnpkg.com/@dhis2/d2-i18n/-/d2-i18n-1.1.3.tgz#ad73030f7cfceeed1b5bcaad86a9b336130bdfb1" + integrity sha512-vOu6RDNumOJM396mHt35bETk9ai9b6XJyAwlUy1HstUZNvfET61F8rjCmMuXZU6zJ8ELux8kMFqlH8IG0vDJmA== dependencies: + "@types/i18next" "^11.9.0" i18next "^10.3" moment "^2.24.0" @@ -3546,6 +3547,11 @@ dependencies: "@types/node" "*" +"@types/i18next@^11.9.0": + version "11.9.3" + resolved "https://registry.yarnpkg.com/@types/i18next/-/i18next-11.9.3.tgz#04d84c6539908ad69665d26d8967f942d1638550" + integrity sha512-snM7bMKy6gt7UYdpjsxycqSCAy0fr2JVPY0B8tJ2vp9bN58cE7C880k20PWFM4KXxQ3KsstKM8DLCawGCIH0tg== + "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1": version "2.0.3" resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762"