Merge branch 'master' of github.com:dhis2/import-export-app into DHIS…

…2-17151/fix-job-sumary-crash
dhis2 · Apr 21, 2024 · 7ae208f · 7ae208f
2 parents 714f548 + 647e28f
commit 7ae208f
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+## [101.0.5](https://github.com/dhis2/import-export-app/compare/v101.0.4...v101.0.5) (2024-04-21)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([232dbc7](https://github.com/dhis2/import-export-app/commit/232dbc71bb9977644813b6cfcde88707dd0d8c41))
+
+## [101.0.4](https://github.com/dhis2/import-export-app/compare/v101.0.3...v101.0.4) (2024-04-05)
+
+
+### Bug Fixes
+
+* **geojson-import:** only run validator when the use geometry option is selected ([#2003](https://github.com/dhis2/import-export-app/issues/2003)) ([77b25f8](https://github.com/dhis2/import-export-app/commit/77b25f84b80f489da7220bd66ad54d3aae3c33c5))
+
 ## [101.0.3](https://github.com/dhis2/import-export-app/compare/v101.0.2...v101.0.3) (2024-03-11)
 
 

diff --git a/i18n/vi.po b/i18n/vi.po
@@ -1,16 +1,16 @@
 # 
 # Translators:
-# Thuy Nguyen <thuynguyen@hispvietnam.org>, 2022
 # Mai Nguyen <thanhmai.jica@gmail.com>, 2022
 # Viktor Varland <viktor@dhis2.org>, 2022
 # Philip Larsen Donnelly, 2022
+# Thuy Nguyen <thuynguyen@hispvietnam.org>, 2024
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
 "POT-Creation-Date: 2024-03-01T15:50:32.586Z\n"
 "PO-Revision-Date: 2019-06-04 17:24+0000\n"
-"Last-Translator: Philip Larsen Donnelly, 2022\n"
+"Last-Translator: Thuy Nguyen <thuynguyen@hispvietnam.org>, 2024\n"
 "Language-Team: Vietnamese (https://app.transifex.com/hisp-uio/teams/100509/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -243,7 +243,7 @@ msgid "ID scheme"
 msgstr ""
 
 msgid "UID"
-msgstr ""
+msgstr "UID"
 
 msgid "Identifier"
 msgstr "Ký hiệu nhận dạng (ID)"
@@ -972,7 +972,7 @@ msgid "The app could not retrieve required data."
 msgstr ""
 
 msgid "Network error"
-msgstr ""
+msgstr "Lỗi mạng"
 
 msgid "Cannot get authorization token for Google Earth Engine."
 msgstr ""

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "import-export-app",
-    "version": "101.0.3",
+    "version": "101.0.5",
     "description": "",
     "license": "BSD-3-Clause",
     "private": true,

diff --git a/src/components/Geometry/GeometryAttributePicker.js b/src/components/Geometry/GeometryAttributePicker.js
@@ -66,7 +66,7 @@ const GeometryAttributePicker = ({
                     selectedLabel={SELECTEDLABEL}
                     dataTest={DATATEST}
                     multiSelect={multiSelect}
-                    validator={VALIDATOR}
+                    validator={useAttribute ? VALIDATOR : Function.prototype}
                     autoSelectFirst
                     {...rest}
                 />