fix: standardize captions and reflect the menus below (v40) [DHIS2-12…

…655]
dhis2 · May 31, 2024 · 7405c52 · 7405c52
1 parent d62eeb8
commit 7405c52
Show file tree

Hide file tree

Showing 11 changed files with 53 additions and 49 deletions.
diff --git a/i18n/en.pot b/i18n/en.pot
@@ -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-03-01T15:50:32.586Z\n"
-"PO-Revision-Date: 2024-03-01T15:50:32.586Z\n"
+"POT-Creation-Date: 2024-05-31T13:35:35.188Z\n"
+"PO-Revision-Date: 2024-05-31T13:35:35.189Z\n"
 
 msgid "Something went wrong when loading the current user!"
 msgstr "Something went wrong when loading the current user!"
@@ -214,11 +214,11 @@ msgstr "JSON"
 msgid "CSV"
 msgstr "CSV"
 
-msgid "XML"
-msgstr "XML"
+msgid "DXF2 (XML)"
+msgstr "DXF2 (XML)"
 
-msgid "ADX"
-msgstr "ADX"
+msgid "ADX (XML)"
+msgstr "ADX (XML)"
 
 msgid "PDF"
 msgstr "PDF"
@@ -791,30 +791,30 @@ msgid "Something went wrong when loading the program stages"
 msgstr "Something went wrong when loading the program stages"
 
 msgid ""
-"Export metadata, such as data elements and organisation units, in DXF 2 "
-"format."
+"Export metadata, such as data elements and organisation units, to JSON, "
+"CSV, DXF2, or ADX format."
 msgstr ""
-"Export metadata, such as data elements and organisation units, in DXF 2 "
-"format."
+"Export metadata, such as data elements and organisation units, to JSON, "
+"CSV, DXF2, or ADX format."
 
 msgid "Date range to export data for"
 msgstr "Date range to export data for"
 
 msgid "Export data"
 msgstr "Export data"
 
-msgid "Import data values from ADX XML, DXF 2 XML, JSON, CSV or PDF files."
-msgstr "Import data values from ADX XML, DXF 2 XML, JSON, CSV or PDF files."
+msgid "Import data values using JSON, CSV, DXF2, ADX, or PDF format."
+msgstr "Import data values using JSON, CSV, DXF2, ADX, or PDF format."
 
-msgid "Supported file types: JSON, CSV, XML, ADX and PDF."
-msgstr "Supported file types: JSON, CSV, XML, ADX and PDF."
+msgid "Supported file types: JSON, CSV, DXF2, ADX, and PDF."
+msgstr "Supported file types: JSON, CSV, DXF2, ADX, and PDF."
 
 msgid ""
 "Import high resolution population data from WorldPop using Google Earth "
-"Engine"
+"Engine."
 msgstr ""
 "Import high resolution population data from WorldPop using Google Earth "
-"Engine"
+"Engine."
 
 msgid "Earth Engine source"
 msgstr "Earth Engine source"
@@ -1116,21 +1116,25 @@ msgstr ""
 "Select polygon organisation units or use a catchment area as associated "
 "geometry."
 
-msgid "Export event data for programs, stages and tracked entities in DXF 2 format."
-msgstr "Export event data for programs, stages and tracked entities in DXF 2 format."
+msgid ""
+"Export event data for programs, stages and tracked entities to JSON, CSV, "
+"or DXF2 format."
+msgstr ""
+"Export event data for programs, stages and tracked entities to JSON, CSV, "
+"or DXF2 format."
 
 msgid "Export events"
 msgstr "Export events"
 
 msgid ""
-"Import events for programs, stages and tracked entities using the DXF 2 "
-"format."
+"Import event data for programs, stages and tracked entities to JSON, CSV, "
+"or DXF2 format."
 msgstr ""
-"Import events for programs, stages and tracked entities using the DXF 2 "
-"format."
+"Import event data for programs, stages and tracked entities to JSON, CSV, "
+"or DXF2 format."
 
-msgid "Supported file types: JSON, CSV, and XML."
-msgstr "Supported file types: JSON, CSV, and XML."
+msgid "Supported file types: JSON, CSV, and DXF2."
+msgstr "Supported file types: JSON, CSV, and DXF2."
 
 msgid "Organisation unit geometry import"
 msgstr "Organisation unit geometry import"
@@ -1200,11 +1204,11 @@ msgstr ""
 "format."
 
 msgid ""
-"Import metadata like data elements and organisation units using the JSON "
-"and CSV format."
+"Import metadata, such as data elements and organisation units, using JSON "
+"or CSV format."
 msgstr ""
-"Import metadata like data elements and organisation units using the JSON "
-"and CSV format."
+"Import metadata, such as data elements and organisation units, using JSON "
+"or CSV format."
 
 msgid "Supported file types: JSON and CSV."
 msgstr "Supported file types: JSON and CSV."
@@ -1215,8 +1219,8 @@ msgstr "A class key must be selected"
 msgid "Tracked entity instances export"
 msgstr "Tracked entity instances export"
 
-msgid "Export tracked entity instances in XML, JSON or CSV format."
-msgstr "Export tracked entity instances in XML, JSON or CSV format."
+msgid "Export tracked entity instances in JSON, CSV, or DXF2 format."
+msgstr "Export tracked entity instances in JSON, CSV, or DXF2 format."
 
 msgid "Program to export from"
 msgstr "Program to export from"
@@ -1230,11 +1234,11 @@ msgstr "At least one of the 'last updated' date fields must be specified"
 msgid "Tracked entity instances import"
 msgstr "Tracked entity instances import"
 
-msgid "Import tracked entity instances from JSON or XML files."
-msgstr "Import tracked entity instances from JSON or XML files."
+msgid "Import tracked entity instances using JSON or DXF2 format."
+msgstr "Import tracked entity instances using JSON or DXF2 format."
 
-msgid "Supported file types: JSON and XML."
-msgstr "Supported file types: JSON and XML."
+msgid "Supported file types: JSON and DXF2."
+msgstr "Supported file types: JSON and DXF2."
 
 msgid "Job started."
 msgstr "Job started."

diff --git a/src/components/Inputs/Format.js b/src/components/Inputs/Format.js
@@ -7,7 +7,7 @@ import { RadioGroupField } from '../index.js'
 const formatOptions = [
     { value: 'json', label: i18n.t('JSON') },
     { value: 'csv', label: i18n.t('CSV') },
-    { value: 'xml', label: i18n.t('XML') },
+    { value: 'xml', label: i18n.t('DXF2 (XML)') },
 ]
 
 const formatNoCsvOptions = formatOptions.filter((f) => f.value != 'csv')
@@ -18,11 +18,11 @@ const formatNoXmlNoCsvOptions = formatOptions.filter(
 
 const formatAdxOptions = [
     ...formatOptions,
-    { value: 'adx', label: i18n.t('ADX') },
+    { value: 'adx', label: i18n.t('ADX (XML)') },
 ]
 const formatAdxXMLOptions = [
     ...formatOptions,
-    { value: 'adx+xml', label: i18n.t('ADX') },
+    { value: 'adx+xml', label: i18n.t('ADX (XML)') },
 ]
 const formatAdxPdfOptions = [
     ...formatAdxOptions,

diff --git a/src/pages/DataExport/DataExport.js b/src/pages/DataExport/DataExport.js
@@ -40,7 +40,7 @@ const { Form } = ReactFinalForm
 // PAGE INFO
 export const PAGE_NAME = i18n.t('Data export')
 export const PAGE_DESCRIPTION = i18n.t(
-    'Export metadata, such as data elements and organisation units, in DXF 2 format.'
+    'Export metadata, such as data elements and organisation units, to JSON, CSV, DXF2, or ADX format.'
 )
 const PAGE_ICON = <DataIcon />
 

diff --git a/src/pages/DataImport/DataImport.js b/src/pages/DataImport/DataImport.js
@@ -46,7 +46,7 @@ const { Form } = ReactFinalForm
 // PAGE INFO
 export const PAGE_NAME = i18n.t('Data import')
 export const PAGE_DESCRIPTION = i18n.t(
-    'Import data values from ADX XML, DXF 2 XML, JSON, CSV or PDF files.'
+    'Import data values using JSON, CSV, DXF2, ADX, or PDF format.'
 )
 const PAGE_ICON = <DataIcon />
 
@@ -121,7 +121,7 @@ const DataImport = () => {
                         <BasicOptions>
                             <FileUpload
                                 helpText={i18n.t(
-                                    'Supported file types: JSON, CSV, XML, ADX and PDF.',
+                                    'Supported file types: JSON, CSV, DXF2, ADX, and PDF.',
                                     {
                                         nsSeparator: '>',
                                     }

diff --git a/src/pages/EarthEngineImport/EarthEngineImport.js b/src/pages/EarthEngineImport/EarthEngineImport.js
@@ -7,7 +7,7 @@ import { CachedDataQueryProvider } from './util/CachedQueryProvider.js'
 // PAGE INFO
 export const PAGE_NAME = i18n.t('Earth Engine import')
 export const PAGE_DESCRIPTION = i18n.t(
-    'Import high resolution population data from WorldPop using Google Earth Engine'
+    'Import high resolution population data from WorldPop using Google Earth Engine.'
 )
 
 const query = {

diff --git a/src/pages/EarthEngineImport/EarthEngineImportForm.js b/src/pages/EarthEngineImport/EarthEngineImportForm.js
@@ -105,7 +105,7 @@ const EarthEngineImportForm = () => {
             <Page
                 title={i18n.t('Earth Engine import')}
                 desc={i18n.t(
-                    'Import high resolution population data from WorldPop using Google Earth Engine'
+                    'Import high resolution population data from WorldPop using Google Earth Engine.'
                 )}
                 icon={<DataIcon />}
                 loading={progress}

diff --git a/src/pages/EventExport/EventExport.js b/src/pages/EventExport/EventExport.js
@@ -41,7 +41,7 @@ const { Form } = ReactFinalForm
 // PAGE INFO
 export const PAGE_NAME = i18n.t('Event export')
 export const PAGE_DESCRIPTION = i18n.t(
-    'Export event data for programs, stages and tracked entities in DXF 2 format.'
+    'Export event data for programs, stages and tracked entities to JSON, CSV, or DXF2 format.'
 )
 const PAGE_ICON = <EventIcon />
 

diff --git a/src/pages/EventImport/EventImport.js b/src/pages/EventImport/EventImport.js
@@ -34,7 +34,7 @@ import { onImport } from './form-helper.js'
 // PAGE INFO
 export const PAGE_NAME = i18n.t('Event import')
 export const PAGE_DESCRIPTION = i18n.t(
-    'Import events for programs, stages and tracked entities using the DXF 2 format.'
+    'Import event data for programs, stages and tracked entities to JSON, CSV, or DXF2 format.'
 )
 const PAGE_ICON = <EventIcon />
 
@@ -95,7 +95,7 @@ const EventImport = () => {
                         <BasicOptions>
                             <FileUpload
                                 helpText={i18n.t(
-                                    'Supported file types: JSON, CSV, and XML.',
+                                    'Supported file types: JSON, CSV, and DXF2.',
                                     {
                                         nsSeparator: '>',
                                     }

diff --git a/src/pages/MetadataImport/MetadataImport.js b/src/pages/MetadataImport/MetadataImport.js
@@ -50,7 +50,7 @@ const { Form } = ReactFinalForm
 // PAGE INFO
 export const PAGE_NAME = i18n.t('Metadata import')
 export const PAGE_DESCRIPTION = i18n.t(
-    'Import metadata like data elements and organisation units using the JSON and CSV format.'
+    'Import metadata, such as data elements and organisation units, using JSON or CSV format.'
 )
 const PAGE_ICON = <MetadataImportIcon />
 

diff --git a/src/pages/TEIExport/TEIExport.js b/src/pages/TEIExport/TEIExport.js
@@ -55,7 +55,7 @@ const { Form } = ReactFinalForm
 // PAGE INFO
 export const PAGE_NAME = i18n.t('Tracked entity instances export')
 export const PAGE_DESCRIPTION = i18n.t(
-    'Export tracked entity instances in XML, JSON or CSV format.'
+    'Export tracked entity instances in JSON, CSV, or DXF2 format.'
 )
 const PAGE_ICON = <TEIIcon />
 

diff --git a/src/pages/TEIImport/TEIImport.js b/src/pages/TEIImport/TEIImport.js
@@ -56,7 +56,7 @@ const { Form } = ReactFinalForm
 // PAGE INFO
 export const PAGE_NAME = i18n.t('Tracked entity instances import')
 export const PAGE_DESCRIPTION = i18n.t(
-    'Import tracked entity instances from JSON or XML files.'
+    'Import tracked entity instances using JSON or DXF2 format.'
 )
 const PAGE_ICON = <TEIIcon />
 
@@ -136,7 +136,7 @@ const TEIImport = () => {
                         <BasicOptions>
                             <FileUpload
                                 helpText={i18n.t(
-                                    'Supported file types: JSON and XML.',
+                                    'Supported file types: JSON and DXF2.',
                                     {
                                         nsSeparator: '>',
                                     }