Skip to content

Commit

Permalink
Merge branch 'master' into fix/enable-user-ou-and-groups
Browse files Browse the repository at this point in the history
  • Loading branch information
janhenrikoverland authored Oct 25, 2024
2 parents 337c959 + 5b5cea9 commit 0345b36
Show file tree
Hide file tree
Showing 70 changed files with 2,309 additions and 1,126 deletions.
6 changes: 6 additions & 0 deletions .storybook/preview-head.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link
href="https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap"
rel="stylesheet"
/>
21 changes: 21 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,24 @@
# [26.9.0](https://github.com/dhis2/analytics/compare/v26.8.8...v26.9.0) (2024-10-22)


### Features

* implement Single Value as a Highcharts.Chart instance and add offline exporting module ([#1698](https://github.com/dhis2/analytics/issues/1698)) ([40fdfba](https://github.com/dhis2/analytics/commit/40fdfba1c3041cb7cf57845aa101c8a64f0cd919))

## [26.8.8](https://github.com/dhis2/analytics/compare/v26.8.7...v26.8.8) (2024-10-20)


### Bug Fixes

* **translations:** sync translations from transifex (master) ([f187092](https://github.com/dhis2/analytics/commit/f1870928b37733395d7f911f48ea7268fed97be1))

## [26.8.7](https://github.com/dhis2/analytics/compare/v26.8.6...v26.8.7) (2024-10-18)


### Bug Fixes

* compute totals and cumulative values for numeric/boolean types respecting totalAggregationType (DHIS2-9155) ([#1700](https://github.com/dhis2/analytics/issues/1700)) ([a2bfd20](https://github.com/dhis2/analytics/commit/a2bfd203cb53f174106d8b570cea52cbfc6136f7))

## [26.8.6](https://github.com/dhis2/analytics/compare/v26.8.5...v26.8.6) (2024-10-06)


Expand Down
10 changes: 8 additions & 2 deletions i18n/en.pot
Original file line number Diff line number Diff line change
Expand Up @@ -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: 2024-08-27T11:29:09.031Z\n"
"PO-Revision-Date: 2024-08-27T11:29:09.033Z\n"
"POT-Creation-Date: 2024-10-11T12:49:26.846Z\n"
"PO-Revision-Date: 2024-10-11T12:49:26.847Z\n"

msgid "view only"
msgstr "view only"
Expand Down Expand Up @@ -855,6 +855,9 @@ msgstr "Financial Years"
msgid "Years"
msgstr "Years"

msgid "Value: {{value}}"
msgstr "Value: {{value}}"

msgid "Bold text"
msgstr "Bold text"

Expand Down Expand Up @@ -1125,6 +1128,9 @@ msgstr "{{thresholdFactor}} × Z-score low"
msgid "{{thresholdFactor}} × Z-score high"
msgstr "{{thresholdFactor}} × Z-score high"

msgid "Not applicable"
msgstr "Not applicable"

msgid "Data"
msgstr "Data"

Expand Down
86 changes: 49 additions & 37 deletions i18n/lo.po
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
# Somkhit Bouavong <[email protected]>, 2022
# Philip Larsen Donnelly, 2023
# Phouthasinh PHEUAYSITHIPHONE, 2023
# Saysamone Sibounma, 2023
# Namwan Chanthavisouk, 2024
# Saysamone Sibounma, 2024
#
msgid ""
msgstr ""
"Project-Id-Version: i18next-conv\n"
"POT-Creation-Date: 2024-01-25T12:05:03.360Z\n"
"POT-Creation-Date: 2024-10-11T12:49:26.846Z\n"
"PO-Revision-Date: 2020-04-28 22:05+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"
Expand Down Expand Up @@ -78,6 +78,12 @@ msgstr "ກ່ຽວກັບບັນຊີລາຍຊື່"
msgid "About this visualization"
msgstr "ກ່ຽວກັບການສ້າງພາບຂໍ້ມູນ"

msgid "About this event chart"
msgstr "ກ່ຽວກັບເຫດການແຜນຜັງ"

msgid "About this event report"
msgstr "ກ່ຽວກັບບົດລາຍງານເຫດການຕ່າງໆ"

msgid "This app could not retrieve required data."
msgstr "ແອັບນີ້ບໍ່ສາມາດດຶງຂໍ້ມູນທີ່ຕ້ອງການໄດ້"

Expand All @@ -91,7 +97,7 @@ msgid "Data / New calculation"
msgstr "ຂໍ້ມູນ / ຄິດໄລ່ໃໝ່"

msgid "Remove item"
msgstr "ລົບລາຍການ"
msgstr "ເອົາລາຍການອອກ"

msgid "Check formula"
msgstr "ກວດເບິ່ງສູດ"
Expand Down Expand Up @@ -435,39 +441,6 @@ msgstr "ບໍ່ສາມາດອັບເດດຂໍ້ຄວາມ"
msgid "Enter interpretation text"
msgstr "ປ້ອນຂໍ້ຄວາມ"

msgid "Bold text"
msgstr "ຕົວອັກສອນເຂັ້ມ"

msgid "Italic text"
msgstr "ຕົວອັກສອນສະຫຼ່ຽງ"

msgid "Link to a URL"
msgstr "ເຊື່ອມຕໍ່ກັບ URL"

msgid "Mention a user"
msgstr "ກ່າວເຖິງຜູ້ໃຊ້"

msgid "Add emoji"
msgstr "ເພີ່ມ emoji"

msgid "Preview"
msgstr "ເບິ່ງຕົວຢ່າງ"

msgid "Back to write mode"
msgstr "ກັບໄປທີ່ໂໝດຂຽນ"

msgid "Too many results. Try refining the search."
msgstr "ຜົນໄດ້ຮັບຫຼາຍເກີນໄປ. ປັບປຸງການຄົ້ນຫາ."

msgid "Search for a user"
msgstr "ຄົ້ນຫາຜູ້ໃຊ້"

msgid "Searching for \"{{- searchText}}\""
msgstr "ຄົ້ນຫາ \"{{- searchText}}\""

msgid "No results found"
msgstr "ບໍ່ພົບຜົນການຊອກຫາ"

msgid "Not available offline"
msgstr "ບໍ່ສາມາດໃຊ້ໄດ້ອອບລາຍ"

Expand Down Expand Up @@ -880,6 +853,30 @@ msgstr "ສົກປີງົບປະມານ"
msgid "Years"
msgstr "ປີ"

msgid "Value: {{value}}"
msgstr ""

msgid "Bold text"
msgstr "ຕົວອັກສອນເຂັ້ມ"

msgid "Italic text"
msgstr "ຕົວອັກສອນສະຫຼ່ຽງ"

msgid "Link to a URL"
msgstr "ເຊື່ອມຕໍ່ກັບ URL"

msgid "Mention a user"
msgstr "ກ່າວເຖິງຜູ້ໃຊ້"

msgid "Add emoji"
msgstr "ເພີ່ມ emoji"

msgid "Preview"
msgstr "ເບິ່ງຕົວຢ່າງ"

msgid "Back to write mode"
msgstr "ກັບໄປທີ່ໂໝດຂຽນ"

msgid "Interpretations and details"
msgstr "ຂໍ້ມູນ ແລະ ລາຍລະອຽດ"

Expand Down Expand Up @@ -910,6 +907,18 @@ msgstr "ບໍ່ສາມາດໂຫຼດການແປ"
msgid "Retry"
msgstr "ລອງໃໝ່"

msgid "Too many results. Try refining the search."
msgstr "ຜົນໄດ້ຮັບຫຼາຍເກີນໄປ. ປັບປຸງການຄົ້ນຫາ."

msgid "Search for a user"
msgstr "ຄົ້ນຫາຜູ້ໃຊ້"

msgid "Searching for \"{{- searchText}}\""
msgstr "ຄົ້ນຫາ \"{{- searchText}}\""

msgid "No results found"
msgstr "ບໍ່ພົບຜົນການຊອກຫາ"

msgid "Series"
msgstr "ແທ່ງ"

Expand Down Expand Up @@ -1117,6 +1126,9 @@ msgstr "{{thresholdFactor}} x ຄະແນນ z ຕ່ຳ"
msgid "{{thresholdFactor}} × Z-score high"
msgstr "{{thresholdFactor}} x ຄະແນນ z ສູງ"

msgid "Not applicable"
msgstr ""

msgid "Data"
msgstr "ຂໍ້ມູນ"

Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dhis2/analytics",
"version": "26.8.6",
"version": "26.9.0",
"main": "./build/cjs/index.js",
"module": "./build/es/index.js",
"exports": {
Expand All @@ -20,7 +20,6 @@
},
"scripts": {
"build": "d2-app-scripts build",
"postbuild": "yarn build-storybook",
"build-storybook": "build-storybook",
"start-storybook": "start-storybook --port 5000",
"start": "yarn start-storybook",
Expand Down
Loading

0 comments on commit 0345b36

Please sign in to comment.