From d1ae89e2e4cc5b203b1a6db7e8a6e21de10b6736 Mon Sep 17 00:00:00 2001 From: Ben Guaraldi Date: Fri, 9 Feb 2024 20:28:19 -0500 Subject: [PATCH] fix: update captions and options to match each other [DHIS2-12655] --- i18n/en.pot | 44 ++++++++++++++-------------- src/components/Inputs/Format.js | 2 +- src/pages/DataExport/DataExport.js | 2 +- src/pages/DataImport/DataImport.js | 4 +-- src/pages/EventExport/EventExport.js | 2 +- src/pages/EventImport/EventImport.js | 4 +-- src/pages/TEIExport/TEIExport.js | 2 +- src/pages/TEIImport/TEIImport.js | 4 +-- 8 files changed, 32 insertions(+), 32 deletions(-) diff --git a/i18n/en.pot b/i18n/en.pot index 5d9b098e1..6e7986b8a 100644 --- 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-02-01T17:32:05.572Z\n" -"PO-Revision-Date: 2024-02-01T17:32:05.573Z\n" +"POT-Creation-Date: 2024-02-10T01:26:37.190Z\n" +"PO-Revision-Date: 2024-02-10T01:26:37.191Z\n" msgid "Something went wrong when loading the current user!" msgstr "Something went wrong when loading the current user!" @@ -214,8 +214,8 @@ msgstr "JSON" msgid "CSV" msgstr "CSV" -msgid "XML" -msgstr "XML" +msgid "DXF2" +msgstr "DXF2" msgid "ADX" msgstr "ADX" @@ -786,10 +786,10 @@ msgstr "Something went wrong when loading the program stages" msgid "" "Export metadata, such as data elements and organisation units, to JSON, " -"CSV, DXF 2 XML, or ADX XML format." +"CSV, DXF2, or ADX format." msgstr "" "Export metadata, such as data elements and organisation units, to JSON, " -"CSV, DXF 2 XML, or ADX XML format." +"CSV, DXF2, or ADX format." msgid "Date range to export data for" msgstr "Date range to export data for" @@ -797,11 +797,11 @@ msgstr "Date range to export data for" msgid "Export data" msgstr "Export data" -msgid "Import data values using ADX XML, DXF 2 XML, JSON, CSV or PDF format." -msgstr "Import data values using ADX XML, DXF 2 XML, JSON, CSV or PDF format." +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 " @@ -1112,23 +1112,23 @@ msgstr "" msgid "" "Export event data for programs, stages and tracked entities to JSON, CSV, " -"or DXF 2 XML format." +"or DXF2 format." msgstr "" "Export event data for programs, stages and tracked entities to JSON, CSV, " -"or DXF 2 XML format." +"or DXF2 format." msgid "Export events" msgstr "Export events" msgid "" "Import event data for programs, stages and tracked entities to JSON, CSV, " -"or DXF 2 XML format." +"or DXF2 format." msgstr "" "Import event data for programs, stages and tracked entities to JSON, CSV, " -"or DXF 2 XML format." +"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" @@ -1213,8 +1213,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" @@ -1228,11 +1228,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 using JSON or XML format." -msgstr "Import tracked entity instances using JSON or XML format." +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 index 21addc15a..fb10f21d8 100644 --- 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') }, ] const formatNoCsvOptions = formatOptions.filter((f) => f.value != 'csv') diff --git a/src/pages/DataExport/DataExport.js b/src/pages/DataExport/DataExport.js index 4f3a9da40..d0f0b987a 100644 --- 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, to JSON, CSV, DXF 2 XML, or ADX XML format.' + 'Export metadata, such as data elements and organisation units, to JSON, CSV, DXF2, or ADX format.' ) const PAGE_ICON = diff --git a/src/pages/DataImport/DataImport.js b/src/pages/DataImport/DataImport.js index c32e7a188..6f42c86dc 100644 --- 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 using ADX XML, DXF 2 XML, JSON, CSV or PDF format.' + 'Import data values using JSON, CSV, DXF2, ADX, or PDF format.' ) const PAGE_ICON = @@ -121,7 +121,7 @@ const DataImport = () => { ', } diff --git a/src/pages/EventExport/EventExport.js b/src/pages/EventExport/EventExport.js index 4def2586a..e88f1fef5 100644 --- 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 to JSON, CSV, or DXF 2 XML format.' + 'Export event data for programs, stages and tracked entities to JSON, CSV, or DXF2 format.' ) const PAGE_ICON = diff --git a/src/pages/EventImport/EventImport.js b/src/pages/EventImport/EventImport.js index 26cffc457..4f9e867f9 100644 --- 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 event data for programs, stages and tracked entities to JSON, CSV, or DXF 2 XML format.' + 'Import event data for programs, stages and tracked entities to JSON, CSV, or DXF2 format.' ) const PAGE_ICON = @@ -95,7 +95,7 @@ const EventImport = () => { ', } diff --git a/src/pages/TEIExport/TEIExport.js b/src/pages/TEIExport/TEIExport.js index 24f061844..c870c13b9 100644 --- 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 = diff --git a/src/pages/TEIImport/TEIImport.js b/src/pages/TEIImport/TEIImport.js index 765b42d8d..3daed9cf9 100644 --- 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 using JSON or XML format.' + 'Import tracked entity instances using JSON or DXF2 format.' ) const PAGE_ICON = @@ -136,7 +136,7 @@ const TEIImport = () => { ', }