Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: update captions to reflect the menus below [DHIS2-12655] #1977

Merged
merged 6 commits into from
Feb 21, 2024
Merged

fix: update captions to reflect the menus below [DHIS2-12655] #1977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c5a2aa5
fix: update captions to reflect the menus below [DHIS2-12655]
benguaraldi Jan 29, 2024
2093b3f
fix: update captions without changing the autogenerated po files [DHI…
benguaraldi Jan 30, 2024
a7e145c
fix: update captions with the autogenerated pot file [DHIS2-12655]
benguaraldi Jan 30, 2024
0c79683
fix: update one additional caption [DHIS2-12655]
benguaraldi Feb 1, 2024
d1ae89e
fix: update captions and options to match each other [DHIS2-12655]
benguaraldi Feb 10, 2024
b4b818f
fix: update options to indicate which are XML [DHIS2-12655]
benguaraldi Feb 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 38 additions & 34 deletions i18n/en.pot
View file
Open in desktop
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-03-06T13:48:45.764Z\n"
"PO-Revision-Date: 2023-03-06T13:48:45.764Z\n"
"POT-Creation-Date: 2024-02-12T17:08:02.188Z\n"
"PO-Revision-Date: 2024-02-12T17:08:02.189Z\n"

msgid "Something went wrong when loading the current user!"
msgstr "Something went wrong when loading the current user!"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -785,30 +785,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"
Expand Down Expand Up @@ -1110,21 +1110,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"
Expand Down Expand Up @@ -1194,11 +1198,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."
Expand All @@ -1209,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"
Expand All @@ -1224,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 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."
Expand Down
6 changes: 3 additions & 3 deletions src/components/Inputs/Format.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/pages/DataExport/DataExport.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 />

Expand Down
4 changes: 2 additions & 2 deletions src/pages/DataImport/DataImport.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 />

Expand Down Expand Up @@ -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: '>',
}
Expand Down
2 changes: 1 addition & 1 deletion src/pages/EarthEngineImport/EarthEngineImport.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
2 changes: 1 addition & 1 deletion src/pages/EarthEngineImport/EarthEngineImportForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion src/pages/EventExport/EventExport.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 />

Expand Down
4 changes: 2 additions & 2 deletions src/pages/EventImport/EventImport.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 />

Expand Down Expand Up @@ -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: '>',
}
Expand Down
2 changes: 1 addition & 1 deletion src/pages/MetadataImport/MetadataImport.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 />

Expand Down
2 changes: 1 addition & 1 deletion src/pages/TEIExport/TEIExport.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 />

Expand Down
4 changes: 2 additions & 2 deletions src/pages/TEIImport/TEIImport.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 />

Expand Down Expand Up @@ -136,7 +136,7 @@ const TEIImport = () => {
<BasicOptions>
<FileUpload
helpText={i18n.t(
'Supported file types: JSON and XML.',
'Supported file types: JSON and DXF2.',
{
nsSeparator: '>',
}
Expand Down
Loading