Skip to content

fix: indicate supported version for GML [DHIS2-18232] #2196

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

Merged
merged 4 commits into from
Sep 12, 2025
Merged

fix: indicate supported version for GML [DHIS2-18232] #2196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d70cfb9
fix: add supported version for GML
BRaimbault Aug 22, 2025
f3dfa00
fix: lint error
BRaimbault Aug 22, 2025
edef408
fix: import i18n
BRaimbault Aug 22, 2025
211a37a
fix: add a non-standard nsSeparator
BRaimbault Sep 12, 2025
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
7 changes: 5 additions & 2 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: 2025-03-04T14:17:07.908Z\n"
"PO-Revision-Date: 2025-03-04T14:17:07.908Z\n"
"POT-Creation-Date: 2025-09-12T07:33:15.903Z\n"
"PO-Revision-Date: 2025-09-12T07:33:15.903Z\n"

msgid "Something went wrong when loading the current user!"
msgstr "Something went wrong when loading the current user!"
Expand Down Expand Up @@ -1152,6 +1152,9 @@ msgstr ""
msgid "Supported file types: JSON and CSV."
msgstr "Supported file types: JSON and CSV."

msgid "Supported version: GML 2.0 only."
msgstr "Supported version: GML 2.0 only."

msgid "Organisation unit geometry import"
msgstr "Organisation unit geometry import"

Expand Down
8 changes: 7 additions & 1 deletion src/pages/GeometryImport/GMLImport.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { useConfig } from '@dhis2/app-runtime'
import i18n from '@dhis2/d2-i18n'
import { ReactFinalForm } from '@dhis2/ui'
import React, { useContext, useState } from 'react'
import { useLocation } from 'react-router-dom'
Expand Down Expand Up @@ -58,7 +59,12 @@ const GMLImport = () => {
initialValues={initialValues}
render={({ handleSubmit, form, submitError }) => (
<form onSubmit={handleSubmit}>
<FileUpload />
<FileUpload
helpText={i18n.t(
'Supported version: GML 2.0 only.',
{ nsSeparator: '>' }
)}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you add a non-standard nsSeparator as an option here, e.g.
helpText={i18n.t('Supported version: GML 2.0 only.', { nsSeparator: '>' })?

otherwise, the i18next-scanner will not correctly scan the text for the en.pot file.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed with: 211a37a

/>
<ValidationSummary />
<ImportButtonStrip form={form} />
<FormAlerts alerts={submitError} />
Expand Down
Loading