Merge branch 'master' into feat/interpretations-for-dashboard

CHANGELOG.md

@@ -1,3 +1,17 @@
+## [26.2.2](https://github.com/dhis2/analytics/compare/v26.2.1...v26.2.2) (2024-01-02)
+
+
+### Bug Fixes
+
+* add white-space css to preserve paragraphs in interpretations ([#1599](https://github.com/dhis2/analytics/issues/1599)) ([52ae98d](https://github.com/dhis2/analytics/commit/52ae98d3cadd975c2079055b00adba58f0982ef4))
+
+## [26.2.1](https://github.com/dhis2/analytics/compare/v26.2.0...v26.2.1) (2023-12-24)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([bac4cc9](https://github.com/dhis2/analytics/commit/bac4cc94572b2e8367fb3d1f061eb7ed122f372f))
+
 # [26.2.0](https://github.com/dhis2/analytics/compare/v26.1.8...v26.2.0) (2023-12-14)
 
 

i18n/lo.po

@@ -2,16 +2,16 @@
 # Translators:
 # Viktor Varland <[email protected]>, 2022
 # Somkhit Bouavong <[email protected]>, 2022
-# Saysamone Sibounma, 2022
-# phil_dhis2, 2023
+# Philip Larsen Donnelly, 2023
 # Phouthasinh PHEUAYSITHIPHONE, 2023
+# Saysamone Sibounma, 2023
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2023-04-18T08:41:27.838Z\n"
+"POT-Creation-Date: 2023-09-27T14:15:13.876Z\n"
 "PO-Revision-Date: 2020-04-28 22:05+0000\n"
-"Last-Translator: Phouthasinh PHEUAYSITHIPHONE, 2023\n"
+"Last-Translator: Saysamone Sibounma, 2023\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"
@@ -81,7 +81,7 @@ msgid "This app could not retrieve required data."
 msgstr ""
 
 msgid "Network error"
-msgstr ""
+msgstr "ຂໍ້ຜິດພາດທາງເຄື່ອຂ່າຍ"
 
 msgid "Data / Edit calculation"
 msgstr ""
@@ -90,7 +90,7 @@ msgid "Data / New calculation"
 msgstr ""
 
 msgid "Remove item"
-msgstr ""
+msgstr "ລົບລາຍການ"
 
 msgid "Check formula"
 msgstr ""
@@ -348,6 +348,9 @@ msgstr ""
 msgid "Post reply"
 msgstr ""
 
+msgid "Delete failed"
+msgstr ""
+
 msgid "Could not update comment"
 msgstr ""
 
@@ -374,21 +377,32 @@ msgstr ""
 msgid "Write an interpretation"
 msgstr ""
 
+msgid ""
+"Other people viewing this interpretation in the future may see more data."
+msgstr ""
+
 msgid "Post interpretation"
 msgstr ""
 
 msgid "Interpretations"
 msgstr "ການແປຂໍ້ມູນ"
 
+msgid "Reply"
+msgstr "ຕອບກັບ"
+
+msgid "{{count}} replies"
+msgid_plural "{{count}} replies"
+msgstr[0] ""
+
+msgid "View replies"
+msgstr ""
+
 msgid "Unlike"
 msgstr "ບໍ່ມັກ"
 
 msgid "Like"
 msgstr "ມັກ"
 
-msgid "Reply"
-msgstr "ຕອບກັບ"
-
 msgid "Share"
 msgstr "ເຜີຍແຜ່"
 
@@ -840,6 +854,9 @@ msgstr ""
 msgid "Years"
 msgstr "ປີ"
 
+msgid "Interpretations and details"
+msgstr ""
+
 msgid "Translating to"
 msgstr ""
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/analytics",
-    "version": "26.2.0",
+    "version": "26.2.2",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {

src/components/Interpretations/common/Message/Message.js

@@ -49,6 +49,7 @@ const Message = ({ children, text, created, username }) => {
                     line-height: 19px;
                     color: ${colors.grey900};
                     word-break: break-word;
+                    white-space: pre-line;
                 }
 
                 .content :global(p:first-child) {