Skip to content

chore: [DHIS2-20258] i18n extraction fails with optional chaining #4384

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
henrikmv merged 1 commit into from
Oct 14, 2025
Merged

chore: [DHIS2-20258] i18n extraction fails with optional chaining #4384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 3 deletions ...components/Pages/MainPage/WithoutOrgUnitSelectedMessage/WithoutOrgUnitSelectedMessage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,15 @@ type Props = OwnProps & WithStyles<typeof styles>;

const WithoutOrgUnitSelectedMessagePlain = ({ programId, setShowAccessible, classes }: Props) => {
const { program, programType } = useProgramInfo(programId);
const programName = program?.name;
const IncompleteSelectionMessage = useMemo(() => (programType === programTypes.TRACKER_PROGRAM ? (
i18n.t('Or see all records accessible to you in {{program}} ', {
program: program?.name,
program: programName,
interpolation: { escapeValue: false },
})
) : i18n.t('Or see all events accessible to you in {{program}}',
{ program: program?.name, interpolation: { escapeValue: false } })),
[program?.name, programType]);
{ program: programName, interpolation: { escapeValue: false } })),
[programName, programType]);

return (
<div
Expand Down
5 changes: 3 additions & 2 deletions ...ure-core/components/Pages/ViewEvent/EventDetailsSection/EventDetailsSection.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ const EventDetailsSectionPlain = (props: PlainProps & { classes: any }) => {
const { isWithinValidPeriod } = isValidPeriod(occurredAtClient, expiryPeriod ?? null);
const isDisabled = !eventAccess.write || !isWithinValidPeriod;

const occurredAtValue = eventData?.dataEntryValues?.occurredAt;
const tooltipContent = useMemo(() => {
if (!eventAccess.write) {
return i18n.t("You don't have access to edit this event");
Expand All @@ -102,7 +103,7 @@ const EventDetailsSectionPlain = (props: PlainProps & { classes: any }) => {
return i18n.t(
'{{occurredAt}} belongs to an expired period. Event cannot be edited',
{
occurredAt: eventData?.dataEntryValues?.occurredAt,
occurredAt: occurredAtValue,
interpolation: { escapeValue: false },
},
);
Expand All @@ -111,7 +112,7 @@ const EventDetailsSectionPlain = (props: PlainProps & { classes: any }) => {
}, [
eventAccess.write,
isWithinValidPeriod,
eventData?.dataEntryValues?.occurredAt,
occurredAtValue,
]);

if (error) {
Expand Down
Loading