Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into feat/rich-text-user…
Browse files Browse the repository at this point in the history
…-mention-components
  • Loading branch information
edoardo committed Oct 25, 2023
2 parents 6470d4b + 389983d commit e748233
Show file tree
Hide file tree
Showing 30 changed files with 1,876 additions and 221 deletions.
2 changes: 1 addition & 1 deletion .tx/config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[main]
host = https://www.transifex.com
lang_map = fa_AF: prs, uz@Cyrl: uz, uz@Latn: uz_Latn
lang_map = fa_AF: prs, uz@Cyrl: uz_UZ_Cyrl, uz@Latn: uz_UZ_Latn

[o:hisp-uio:p:app-analytics:r:en-pot]
file_filter = i18n/<lang>.po
Expand Down
59 changes: 59 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,62 @@
## [26.1.3](https://github.com/dhis2/analytics/compare/v26.1.2...v26.1.3) (2023-10-22)


### Bug Fixes

* **translations:** sync translations from transifex (master) ([0a250af](https://github.com/dhis2/analytics/commit/0a250af64b9df6bfd7334f6cf2ecc5d150003e2d))

## [26.1.2](https://github.com/dhis2/analytics/compare/v26.1.1...v26.1.2) (2023-10-18)


### Bug Fixes

* handle both Set and array for currentUser.authorities when checking interpretations access (DHIS2-15964) ([d3d45ab](https://github.com/dhis2/analytics/commit/d3d45abd352a6b9609d732c24a718fef83b076c7))
* interpretation panel display date and timestamps according to client time zone (DHIS2-15825) ([8e60f26](https://github.com/dhis2/analytics/commit/8e60f266bd55f8dee9745ad1930f6525e3ca96f3))
* interpretations modal height (DHIS2-15558) ([014d43e](https://github.com/dhis2/analytics/commit/014d43e241d59e841f72d203f8b8f657516aa147))
* show warning text below RichTextEditor when unable to show snapshot (DHIS2-15781) ([f27bc38](https://github.com/dhis2/analytics/commit/f27bc38e5cf47840971eb685f0ee705f174eadc0))

## [26.1.1](https://github.com/dhis2/analytics/compare/v26.1.0...v26.1.1) (2023-10-05)


### Bug Fixes

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

# [26.1.0](https://github.com/dhis2/analytics/compare/v26.0.21...v26.1.0) (2023-10-03)


### Features

* **pivot-table:** truncate title and show full in tooltip ([#1579](https://github.com/dhis2/analytics/issues/1579)) ([c37ba2d](https://github.com/dhis2/analytics/commit/c37ba2d1a187963b3b5aeee5b951bcf9c129dcd2))

## [26.0.21](https://github.com/dhis2/analytics/compare/v26.0.20...v26.0.21) (2023-09-28)


### Bug Fixes

* avoid crash in DV with some chart types DHIS2-15882 ([#1582](https://github.com/dhis2/analytics/issues/1582)) ([f6c89e1](https://github.com/dhis2/analytics/commit/f6c89e1481dbbc2ea2cfe80a3c9ed7f81a63c83c))

## [26.0.20](https://github.com/dhis2/analytics/compare/v26.0.19...v26.0.20) (2023-09-25)


### Bug Fixes

* export function for preparing payload for copy DHIS2-15722 ([#1573](https://github.com/dhis2/analytics/issues/1573)) ([a1f8d69](https://github.com/dhis2/analytics/commit/a1f8d694121d62d001f7b4567d84d49ecec377fd))

## [26.0.19](https://github.com/dhis2/analytics/compare/v26.0.18...v26.0.19) (2023-09-15)


### Bug Fixes

* use translated dimension labels in PT DHIS2-15750 ([#1572](https://github.com/dhis2/analytics/issues/1572)) ([492975e](https://github.com/dhis2/analytics/commit/492975e46d1570e7856ef217a9a28c3ede5c7fa5))

## [26.0.18](https://github.com/dhis2/analytics/compare/v26.0.17...v26.0.18) (2023-09-13)


### Bug Fixes

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

## [26.0.17](https://github.com/dhis2/analytics/compare/v26.0.16...v26.0.17) (2023-08-28)


Expand Down
7 changes: 5 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: 2023-07-06T08:30:33.216Z\n"
"PO-Revision-Date: 2023-07-06T08:30:33.216Z\n"
"POT-Creation-Date: 2023-09-27T14:15:13.876Z\n"
"PO-Revision-Date: 2023-09-27T14:15:13.876Z\n"

msgid "view only"
msgstr "view only"
Expand Down Expand Up @@ -374,6 +374,9 @@ msgstr "Hide interpretation"
msgid "Write an interpretation"
msgstr "Write an interpretation"

msgid "Other people viewing this interpretation in the future may see more data."
msgstr "Other people viewing this interpretation in the future may see more data."

msgid "Post interpretation"
msgstr "Post interpretation"

Expand Down
6 changes: 3 additions & 3 deletions i18n/es.po
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Gabriela Rodriguez <[email protected]>, 2022
# Viktor Varland <[email protected]>, 2022
# Marta Vila <[email protected]>, 2023
# phil_dhis2, 2023
# Philip Larsen Donnelly, 2023
# Janeth Cruz, 2023
# Sergio Valenzuela <[email protected]>, 2023
# Enzo Nicolas Rossi <[email protected]>, 2023
Expand Down Expand Up @@ -400,7 +400,7 @@ msgid "Write an interpretation"
msgstr "Escribir una interpretación"

msgid "Post interpretation"
msgstr ""
msgstr "Interpretación posterior"

msgid "Interpretations"
msgstr "Interpretaciones"
Expand All @@ -415,7 +415,7 @@ msgstr[1] "{{contar}} respuestas"
msgstr[2] "{{count}} respuestas"

msgid "View replies"
msgstr ""
msgstr "Ver respuestas"

msgid "Unlike"
msgstr "diferente a"
Expand Down
14 changes: 9 additions & 5 deletions i18n/nb.po
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
#
# Translators:
# Karoline Tufte Lien <[email protected]>, 2022
# Caroline Hesthagen Holen <[email protected]>, 2023
# Jen Jones Arnesen <[email protected]>, 2023
# Karoline Tufte Lien <[email protected]>, 2023
#
msgid ""
msgstr ""
"Project-Id-Version: i18next-conv\n"
"POT-Creation-Date: 2023-07-06T08:30:33.216Z\n"
"POT-Creation-Date: 2023-09-27T14:15:13.876Z\n"
"PO-Revision-Date: 2020-04-28 22:05+0000\n"
"Last-Translator: Jen Jones Arnesen <jennifer@dhis2.org>, 2023\n"
"Last-Translator: Karoline Tufte Lien <karoline@dhis2.org>, 2023\n"
"Language-Team: Norwegian Bokmål (https://app.transifex.com/hisp-uio/teams/100509/nb/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -339,7 +339,7 @@ msgid "map"
msgstr "kart"

msgid "visualization"
msgstr ""
msgstr "visualisering"

msgid "Edit"
msgstr "Rediger"
Expand Down Expand Up @@ -379,6 +379,10 @@ msgstr ""
msgid "Write an interpretation"
msgstr "Skriv en tolkning"

msgid ""
"Other people viewing this interpretation in the future may see more data."
msgstr ""

msgid "Post interpretation"
msgstr ""

Expand Down Expand Up @@ -451,7 +455,7 @@ msgid "No results found"
msgstr "Ingen resultater funnet"

msgid "Not available offline"
msgstr ""
msgstr "Ikke tilgjengelig i frakoblet modus"

msgid "Created by"
msgstr "Opprettet av"
Expand Down
File renamed without changes.
Loading

0 comments on commit e748233

Please sign in to comment.