Fixed: Ensure translations are fetched before loading app

Sonarr · Jul 15, 2023 · ad2721d · ad2721d
1 parent 3aa3ac9
commit ad2721d
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 7 deletions.
diff --git a/frontend/build/webpack.config.js b/frontend/build/webpack.config.js
@@ -84,6 +84,10 @@ module.exports = (env) => {
       hints: false
     },
 
+    experiments: {
+      topLevelAwait: true
+    },
+
     plugins: [
       new webpack.DefinePlugin({
         __DEV__: !isProduction,

diff --git a/frontend/src/App/App.js b/frontend/src/App/App.js
@@ -7,13 +7,13 @@ import PageConnector from 'Components/Page/PageConnector';
 import ApplyTheme from './ApplyTheme';
 import AppRoutes from './AppRoutes';
 
-function App({ store, history }) {
+function App({ store, history, hasTranslationsError }) {
   return (
     <DocumentTitle title={window.Sonarr.instanceName}>
       <Provider store={store}>
         <ConnectedRouter history={history}>
           <ApplyTheme>
-            <PageConnector>
+            <PageConnector hasTranslationsError={hasTranslationsError}>
               <AppRoutes app={App} />
             </PageConnector>
           </ApplyTheme>
@@ -25,7 +25,8 @@ function App({ store, history }) {
 
 App.propTypes = {
   store: PropTypes.object.isRequired,
-  history: PropTypes.object.isRequired
+  history: PropTypes.object.isRequired,
+  hasTranslationsError: PropTypes.bool.isRequired
 };
 
 export default App;
diff --git a/frontend/src/Components/Page/ErrorPage.js b/frontend/src/Components/Page/ErrorPage.js
@@ -7,6 +7,7 @@ function ErrorPage(props) {
   const {
     version,
     isLocalStorageSupported,
+    hasTranslationsError,
     seriesError,
     customFiltersError,
     tagsError,
@@ -19,6 +20,8 @@ function ErrorPage(props) {
 
   if (!isLocalStorageSupported) {
     errorMessage = 'Local Storage is not supported or disabled. A plugin or private browsing may have disabled it.';
+  } else if (hasTranslationsError) {
+    errorMessage = 'Failed to load translations from API';
   } else if (seriesError) {
     errorMessage = getErrorMessage(seriesError, 'Failed to load series from API');
   } else if (customFiltersError) {
@@ -49,6 +52,7 @@ function ErrorPage(props) {
 ErrorPage.propTypes = {
   version: PropTypes.string.isRequired,
   isLocalStorageSupported: PropTypes.bool.isRequired,
+  hasTranslationsError: PropTypes.bool.isRequired,
   seriesError: PropTypes.object,
   customFiltersError: PropTypes.object,
   tagsError: PropTypes.object,

diff --git a/frontend/src/Components/Page/PageConnector.js b/frontend/src/Components/Page/PageConnector.js
@@ -220,6 +220,7 @@ class PageConnector extends Component {
 
   render() {
     const {
+      hasTranslationsError,
       isPopulated,
       hasError,
       dispatchFetchSeries,
@@ -232,11 +233,12 @@ class PageConnector extends Component {
       ...otherProps
     } = this.props;
 
-    if (hasError || !this.state.isLocalStorageSupported) {
+    if (hasTranslationsError || hasError || !this.state.isLocalStorageSupported) {
       return (
         <ErrorPage
           {...this.state}
           {...otherProps}
+          hasTranslationsError={hasTranslationsError}
         />
       );
     }
@@ -257,6 +259,7 @@ class PageConnector extends Component {
 }
 
 PageConnector.propTypes = {
+  hasTranslationsError: PropTypes.bool.isRequired,
   isPopulated: PropTypes.bool.isRequired,
   hasError: PropTypes.bool.isRequired,
   isSidebarVisible: PropTypes.bool.isRequired,

diff --git a/frontend/src/Utilities/String/translate.js b/frontend/src/Utilities/String/translate.js
@@ -10,9 +10,11 @@ function getTranslations() {
 
 let translations = {};
 
-getTranslations().then((data) => {
-  translations = data.strings;
-});
+export function fetchTranslations() {
+  return getTranslations().then((data) => {
+    translations = data.strings;
+  });
+}
 
 export default function translate(key, tokens) {
   const translation = translations[key] || key;

diff --git a/frontend/src/index.js b/frontend/src/index.js
@@ -2,6 +2,7 @@ import { createBrowserHistory } from 'history';
 import React from 'react';
 import { render } from 'react-dom';
 import createAppStore from 'Store/createAppStore';
+import { fetchTranslations } from 'Utilities/String/translate';
 import App from './App/App';
 
 import './preload';
@@ -12,11 +13,20 @@ import './index.css';
 
 const history = createBrowserHistory();
 const store = createAppStore(history);
+let hasTranslationsError = false;
+
+try {
+  await fetchTranslations();
+
+} catch (error) {
+  hasTranslationsError = true;
+}
 
 render(
   <App
     store={store}
     history={history}
+    hasTranslationsError={hasTranslationsError}
   />,
   document.getElementById('root')
 );