From d404c45acdff08c6b1697825805b36b6aa4193ff Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Wed, 8 Nov 2023 22:40:19 +0000 Subject: [PATCH 1/4] chore(release): cut 100.3.1 [skip release] ## [100.3.1](https://github.com/dhis2/data-visualizer-app/compare/v100.3.0...v100.3.1) (2023-11-08) ### Bug Fixes * color set update (DHIS2-16108) ([#2906](https://github.com/dhis2/data-visualizer-app/issues/2906)) ([276e741](https://github.com/dhis2/data-visualizer-app/commit/276e741aa3dbc40298155d4e93530a3e8495aaaf)) * legend sets fail to load in table with data dimension in the row (DHIS2-12830) ([#2753](https://github.com/dhis2/data-visualizer-app/issues/2753)) ([8666fbb](https://github.com/dhis2/data-visualizer-app/commit/8666fbb0cfed72a966db49cf7263f608b763795a)) --- CHANGELOG.md | 8 ++++++++ package.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f7635d8b0..cecf7e271a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +## [100.3.1](https://github.com/dhis2/data-visualizer-app/compare/v100.3.0...v100.3.1) (2023-11-08) + + +### Bug Fixes + +* color set update (DHIS2-16108) ([#2906](https://github.com/dhis2/data-visualizer-app/issues/2906)) ([276e741](https://github.com/dhis2/data-visualizer-app/commit/276e741aa3dbc40298155d4e93530a3e8495aaaf)) +* legend sets fail to load in table with data dimension in the row (DHIS2-12830) ([#2753](https://github.com/dhis2/data-visualizer-app/issues/2753)) ([8666fbb](https://github.com/dhis2/data-visualizer-app/commit/8666fbb0cfed72a966db49cf7263f608b763795a)) + # [100.3.0](https://github.com/dhis2/data-visualizer-app/compare/v100.2.0...v100.3.0) (2023-10-20) diff --git a/package.json b/package.json index 7eb40b8953..1427db228d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "data-visualizer-app", - "version": "100.3.0", + "version": "100.3.1", "description": "DHIS2 Data Visualizer", "license": "BSD-3-Clause", "private": true, From 005be599f7dd4382f0086861d74064aedc49ac29 Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Sun, 12 Nov 2023 02:37:08 +0100 Subject: [PATCH 2/4] fix(translations): sync translations from transifex (dev) Automatically merged. --- i18n/zh.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/i18n/zh.po b/i18n/zh.po index 4bc05f235f..3e4ef431de 100644 --- a/i18n/zh.po +++ b/i18n/zh.po @@ -479,10 +479,10 @@ msgid "Legend type" msgstr "图例类型" msgid "Use pre-defined legend by data item" -msgstr "" +msgstr "按数据项使用预定义图例" msgid "Select a legend" -msgstr "" +msgstr "选择图例" msgid "Legend changes background color" msgstr "图例改变背景色" From dfb3927fd4acf03e872a73f102f41883b510a043 Mon Sep 17 00:00:00 2001 From: Jen Jones Arnesen Date: Wed, 15 Nov 2023 17:09:49 -0800 Subject: [PATCH 3/4] chore: use renamed github shared workflow (#2912) --- .github/workflows/dhis2-verify-app.yml | 3 +- .github/workflows/e2e-dev.yml | 76 -------------------------- .github/workflows/nightly.yml | 4 +- 3 files changed, 2 insertions(+), 81 deletions(-) delete mode 100644 .github/workflows/e2e-dev.yml diff --git a/.github/workflows/dhis2-verify-app.yml b/.github/workflows/dhis2-verify-app.yml index b1c195385b..20a4e735fe 100644 --- a/.github/workflows/dhis2-verify-app.yml +++ b/.github/workflows/dhis2-verify-app.yml @@ -83,9 +83,8 @@ jobs: call-workflow-e2e-prod: needs: [build, lint, test] - uses: dhis2/workflows/.github/workflows/analytics-e2e-tests.yml@master + uses: dhis2/workflows/.github/workflows/analytics-e2e-tests-prod.yml@master secrets: - baseurl: ${{ secrets.CYPRESS_DHIS2_BASE_URL_DEV }} username: ${{ secrets.CYPRESS_DHIS2_USERNAME }} password: ${{ secrets.CYPRESS_DHIS2_PASSWORD }} recordkey: ${{ secrets.CYPRESS_RECORD_KEY }} diff --git a/.github/workflows/e2e-dev.yml b/.github/workflows/e2e-dev.yml deleted file mode 100644 index 07f4623057..0000000000 --- a/.github/workflows/e2e-dev.yml +++ /dev/null @@ -1,76 +0,0 @@ -name: 'e2e-dev' - -on: - workflow_call: - secrets: - baseurl: - required: true - username: - required: true - password: - required: true - recordkey: - required: true - -concurrency: - group: e2e-dev-${{ github.workflow}}-${{ github.ref }} - cancel-in-progress: true - -defaults: - run: - shell: bash - -jobs: - compute-dev-version: - if: "!github.event.push.repository.fork && (github.event.pull_request.draft == false || github.action == 'workflow_dispatch')" - runs-on: ubuntu-latest - outputs: - version: ${{ steps.instance-version.outputs.version }} - steps: - - name: Output dev version - id: instance-version - uses: dhis2/action-instance-version@v1 - with: - instance-url: ${{ secrets.baseurl }} - username: ${{ secrets.username }} - password: ${{ secrets.password }} - - e2e-dev: - needs: compute-dev-version - runs-on: ubuntu-latest - container: - image: cypress/browsers:node16.17.0-chrome106 - options: --user 1001 - - strategy: - fail-fast: false - matrix: - containers: [1, 2, 3, 4] - - steps: - - name: Checkout - uses: actions/checkout@v3 - - - uses: actions/setup-node@v3 - with: - node-version: 18.x - - - name: Run e2e tests - uses: cypress-io/github-action@v5 - with: - start: yarn d2-app-scripts start - wait-on: 'http://localhost:3000' - wait-on-timeout: 300 - record: true - parallel: true - browser: chrome - group: e2e-chrome-parallel-dev - env: - BROWSER: none - CYPRESS_RECORD_KEY: ${{ secrets.recordkey }} - CYPRESS_dhis2BaseUrl: ${{ secrets.baseurl }} - CYPRESS_dhis2InstanceVersion: ${{ needs.compute-dev-version.outputs.version }} - CYPRESS_dhis2Username: ${{ secrets.username }} - CYPRESS_dhis2Password: ${{ secrets.password }} - CYPRESS_networkMode: live - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index f8e8303ee8..7699845a12 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -17,10 +17,8 @@ defaults: jobs: call-workflow-e2e-dev: - if: github.ref == 'refs/heads/dev' - uses: ./.github/workflows/e2e-dev.yml + uses: dhis2/workflows/.github/workflows/analytics-e2e-tests-dev.yml@master secrets: - baseurl: ${{ secrets.CYPRESS_DHIS2_BASE_URL_DEV }} username: ${{ secrets.CYPRESS_DHIS2_USERNAME }} password: ${{ secrets.CYPRESS_DHIS2_PASSWORD }} recordkey: ${{ secrets.CYPRESS_RECORD_KEY }} From 65441f2b454a6e0f74567b8b7107cad63d594a04 Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Sun, 19 Nov 2023 02:39:45 +0100 Subject: [PATCH 4/4] fix(translations): sync translations from transifex (dev) Automatically merged. --- i18n/uz_UZ_Cyrl.po | 73 +++++++++++++++++++++++++++++++--------------- 1 file changed, 50 insertions(+), 23 deletions(-) diff --git a/i18n/uz_UZ_Cyrl.po b/i18n/uz_UZ_Cyrl.po index d18b54ab84..193d29b0d6 100644 --- a/i18n/uz_UZ_Cyrl.po +++ b/i18n/uz_UZ_Cyrl.po @@ -1,13 +1,13 @@ # # Translators: -# Ibatov , 2022 +# Ibatov , 2023 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" "POT-Creation-Date: 2023-09-06T13:41:14.540Z\n" "PO-Revision-Date: 2019-06-25 18:46+0000\n" -"Last-Translator: Ibatov , 2022\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" @@ -16,7 +16,7 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" msgid "All items" -msgstr "" +msgstr "Барча элементлар" msgid "Rename successful" msgstr "Муваффақиятли қайта номлаш" @@ -25,7 +25,7 @@ msgid "Untitled {{visualizationType}} visualization, {{date}}" msgstr "Номсиз {{visualizationType}} визуализация, {{date}}" msgid "\"{{- deletedObject}}\" successfully deleted." -msgstr "" +msgstr "\"{{- deletedObject}}\" муваффақиятли ўчирилди." msgid "You have unsaved changes." msgstr "Сизда сақланмаган ўзгартиришлар мавжуд." @@ -111,7 +111,7 @@ msgid "Plain data source" msgstr "Оддий маълумотлар манбаи" msgid "Microsoft Excel" -msgstr "" +msgstr "Microsoft Excel" msgid "CSV" msgstr "CSV" @@ -129,7 +129,7 @@ msgid "PDF (.pdf)" msgstr "PDF (.pdf)" msgid "Download data from this date" -msgstr "" +msgstr "Ушбу маълумотдагиларни юклаш" msgid "Metadata ID scheme" msgstr "МетаМаълумот ID схемаси" @@ -198,7 +198,7 @@ msgid "Only '{{number}}' in use" msgstr "Фойдаланиш учун фақатгина '{{number}}'" msgid "All items are selected" -msgstr "" +msgstr "Барча элементлар танланди" msgid "Levels" msgstr "Босқичлар/Қаватлар" @@ -331,7 +331,7 @@ msgid "Axis title" msgstr "Ўқ сарлавҳаси" msgid "Auto generated from axis items" -msgstr "" +msgstr "Юқори элементлардан авто яратилган" msgid "None" msgstr "Йўқ" @@ -343,7 +343,7 @@ msgid "Add a title" msgstr "Сарлавҳа қўшиш" msgid "Reset style to default" -msgstr "" +msgstr "Стилни стандарт ҳолатга қайтариш" msgid "Base line" msgstr "Базавий чизиқ" @@ -361,7 +361,7 @@ msgid "Basic" msgstr "Асосий" msgid "Extended" -msgstr "" +msgstr "Чўзилган" msgid "Bright" msgstr "Ёрқин" @@ -391,10 +391,12 @@ msgid "Cumulative values" msgstr "Кумулятив қийматлар" msgid "Show data item icon" -msgstr "" +msgstr "Маълумотлар элементи белгисини кўрсатиш" msgid "If the data item has an icon, display it next to the value" msgstr "" +"Агар маълумотлар элементида белги мавжуд булса уни қийматдан кейинги ўринда " +"кўрсатинг" msgid "Digit group separator" msgstr "Рақамлар гуруҳини тақсимловчи" @@ -430,16 +432,16 @@ msgid "Number" msgstr "Тартиб рақами" msgid "Fix column headers to top of table" -msgstr "" +msgstr "Жадвалнинг юқори қисмида устунлар сарлавҳасини тўғриланг" msgid "There aren’t any column headers because Columns is empty." -msgstr "" +msgstr "Устун сарлавҳалари мавжуд эмас, чунки Устунлар бўш" msgid "Fix row headers to left of table" -msgstr "" +msgstr "Жадвалнинг чап қисмида сатрлар сарлавҳаларини тўғриланг" msgid "There aren’t any row headers because Rows is empty." -msgstr "" +msgstr "Қатор сарлавҳалари мавжуд эмас, чунки Қаторлар бўш" msgid "Font size" msgstr "Шрифт ўлчами" @@ -490,10 +492,10 @@ msgid "Legend type" msgstr "Таъриф тури" msgid "Use pre-defined legend by data item" -msgstr "" +msgstr "Маълумотлар элементи учун олдиндан белгиланган изоҳдан фойдаланинг" msgid "Select a legend" -msgstr "" +msgstr "Изоҳни танланг" msgid "Legend changes background color" msgstr "Таъриф фон рангини ўзгартиради" @@ -658,6 +660,8 @@ msgid "" "Series options are not available when a series item has an \"All items\" " "selection" msgstr "" +"Серия вариантларида \"Барча элементлар\" танлови мавжуд бўлса, серия " +"параметрлари мавжуд эмас деб топилади" msgid "Value labels" msgstr "Қиймат ёрлиқлари" @@ -672,7 +676,7 @@ msgid "Show legend key" msgstr "Калит таърифни кўрсатинг" msgid "Show series key" -msgstr "" +msgstr "Сериялар калитини кўрсатиш" msgid "Skip rounding" msgstr "Соддалаштириш ўтказиб юборилсин" @@ -705,10 +709,10 @@ msgid "Options" msgstr "Вариант" msgid "Change org unit" -msgstr "" +msgstr "Ташкилий бирликни танланг" msgid "{{level}} level in {{orgunit}}" -msgstr "" +msgstr "{{level}} босқич да {{orgunit}}" msgid "Open as Map" msgstr "Харита сифатида очиш" @@ -802,6 +806,8 @@ msgid "" "A single indicator or calculation must be the only data item when using " "indicators or calculations as Data in Filter." msgstr "" +"Ягона индикатор ёки калькуляция фақатгина маълумот элементи бўлиши мумкин, " +"қачонки фильтрдан маълумотлар элементидан фойдаланган бўлсангиз" msgid "Data Element Group Sets and Reporting Rates cannot be used together." msgstr "" @@ -849,12 +855,15 @@ msgid "The level or group selections didn't return any organization units." msgstr "Босқич ёки гуруҳ танлаш ҳеч қандай ташкилий бўлимни олиб чиқмади." msgid "Invalid data type" -msgstr "" +msgstr "Маълумот тури хато" msgid "" "The selected data dimensions didn't return any valid data. This " "visualization type can only display numerical data." msgstr "" +"Танланган маълумотлар қийматлари учун ҳеч қандай яроқли маълумот " +"аниқланмади. Ушбу визуализация тури фақат рақамли маълумотларни кўрсатиши " +"мумкин." msgid "Something went wrong" msgstr "Нимадир нотўғри бажарилди" @@ -1003,6 +1012,8 @@ msgstr "Кўп ўқлардан фойдаланганда ранглар тўп msgid "" "Base and target lines are available on the Axes tab for multi-axis charts" msgstr "" +"Кўп ўқли диаграммалар учун \"Ўқлар\" номланишида асосий ва мақсадли чизиқлар" +" мавжуд" msgid "Chart style" msgstr "Диаграмма услуби" @@ -1014,7 +1025,7 @@ msgid "Empty data" msgstr "Бўш маълумотлар" msgid "Horizontal (x) axis {{axisId}}" -msgstr "" +msgstr "Горизонтал (x) ўқ {{axisId}}" msgid "Horizontal (x) axis" msgstr "горизонтал (Х) ўқ" @@ -1026,7 +1037,7 @@ msgid "Totals" msgstr "Жами" msgid "Vertical (y) axis {{axisId}}" -msgstr "" +msgstr "Вертикал (y) ўқ {{axisId}}" msgid "Vertical (y) axis" msgstr "Вертикал (y) ўқи" @@ -1064,33 +1075,47 @@ msgstr "Бошқариладиган жадвалда индикаторлар msgid "" "Compare sizes of related elements vertically. Recommend period as filter." msgstr "" +"Тегишли элементларни ўрчамларини вертикал равишда солиштиринг. Фильтр " +"сифатида давр тавсия этилади." msgid "" "Compare parts of a whole against related elements vertically. Recommend data" " or org. unit as series." msgstr "" +"Тегишли элементларни қисмларини вертикал равишда солиштиринг. Серияси " +"сифатида давр ёки ташкилий бирлик фильтр сифатида тавсия этилади. " msgid "" "Compare sizes of related elements horizontally. Recommend period as filter." msgstr "" +"Тегишли элементларни ўрчамларини горизонтал равишда солиштиринг. Фильтр " +"сифатида давр тавсия этилади." msgid "" "Compare parts of a whole against related elements horizontally. Recommend " "data or org. unit as series." msgstr "" +"Тегишли элементларни қисмларини горизонтал равишда солиштиринг. Серияси " +"сифатида давр ёки ташкилий бирлик фильтр сифатида тавсия этилади. " msgid "Track or compare changes over time. Recommend period as category." msgstr "" +"Доимий равишда кузатинг ва солиштиринг. Даврни категория сифатида тавсия " +"этинг." msgid "" "Track or compare parts of a whole over time. Recommend data as series and " "period as category." msgstr "" +"Даврий равишда бутуннинг қисмларини кузатиб боринг ёки таққосланг. Категория" +" учун серия ва даврни тавсия этинг." msgid "" "Compare parts of a whole at a single point in time. Recommend period as " "filter." msgstr "" +"Яхлитликнинг қисмларини айни бир вақт нуқтасида таққосланг. Фильтр учун " +"даврни тавсия этинг." msgid "Compare several items against multiple variables." msgstr "Бир неча элементлар ва бир неча ўзгарувчиларга нисбатан таққосланг." @@ -1099,6 +1124,8 @@ msgid "" "Compare a percentage indicator against a 100% scale. Recommend period as " "filter." msgstr "" +"100 фоизлик шкала асосида фоизлар нисбатини таққосланг. Фильтр учун даврни " +"тавсия этинг." msgid "Compare changes over time between multiple time periods." msgstr "Вақт ўтиши билан бир неча вақт оралиғидаги ўзгаришларни таққосланг."