From 7df70b21653fde95f42a511e82b1720e36104ab2 Mon Sep 17 00:00:00 2001 From: Nicola Benaglia Date: Fri, 16 May 2025 09:13:44 +0200 Subject: [PATCH] Translate app --- src/components/Apps/AppViewer.tsx | 14 ++++++++++---- src/components/Apps/AppViewerContainer.tsx | 5 ++--- src/i18n/locales/en/core.json | 1 + 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/components/Apps/AppViewer.tsx b/src/components/Apps/AppViewer.tsx index 87f88e8..640d062 100644 --- a/src/components/Apps/AppViewer.tsx +++ b/src/components/Apps/AppViewer.tsx @@ -1,4 +1,4 @@ -import React, { useEffect, useMemo, useState } from 'react'; +import { forwardRef, useEffect, useMemo, useState } from 'react'; import { Box } from '@mui/material'; import { getBaseApiReact } from '../../App'; import { subscribeToEvent, unsubscribeFromEvent } from '../../utils/events'; @@ -7,7 +7,7 @@ import { useQortalMessageListener } from './useQortalMessageListener'; import { useThemeContext } from '../Theme/ThemeContext'; import { useTranslation } from 'react-i18next'; -export const AppViewer = React.forwardRef( +export const AppViewer = forwardRef( ({ app, hide, isDevMode, skipAuth }, iframeRef) => { // const iframeRef = useRef(null); const { window: frameWindow } = useFrame(); @@ -23,7 +23,7 @@ export const AppViewer = React.forwardRef( ); const [url, setUrl] = useState(''); const { themeMode } = useThemeContext(); - const { i18n } = useTranslation(['core']); + const { i18n, t } = useTranslation(['core']); const currentLang = i18n.language; useEffect(() => { @@ -184,7 +184,13 @@ export const AppViewer = React.forwardRef( // Timeout after 200ms if no response setTimeout(() => { window.removeEventListener('message', handleNavigationSuccess); - reject(new Error('Navigation timeout')); + reject( + new Error( + t('core:message.error.navigation_timeout', { + postProcess: 'capitalizeFirst', + }) + ) + ); }, 200); const targetOrigin = iframeRef.current ? new URL(iframeRef.current.src).origin diff --git a/src/components/Apps/AppViewerContainer.tsx b/src/components/Apps/AppViewerContainer.tsx index b159aa7..38c017b 100644 --- a/src/components/Apps/AppViewerContainer.tsx +++ b/src/components/Apps/AppViewerContainer.tsx @@ -1,9 +1,8 @@ -import React, { useContext } from 'react'; +import { forwardRef } from 'react'; import { AppViewer } from './AppViewer'; import Frame from 'react-frame-component'; -import { MyContext } from '../../App'; -const AppViewerContainer = React.forwardRef( +const AppViewerContainer = forwardRef( ({ app, isSelected, hide, isDevMode, customHeight, skipAuth }, ref) => { return (