diff --git a/frontend/build/webpack.config.js b/frontend/build/webpack.config.js index a83d48c07a..92986a57ca 100644 --- a/frontend/build/webpack.config.js +++ b/frontend/build/webpack.config.js @@ -83,10 +83,6 @@ 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 index ae29b0c2f6..41691a8239 100644 --- 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, hasTranslationsError }) { +function App({ store, history }) { return ( - + @@ -25,8 +25,7 @@ function App({ store, history, hasTranslationsError }) { App.propTypes = { store: PropTypes.object.isRequired, - history: PropTypes.object.isRequired, - hasTranslationsError: PropTypes.bool.isRequired + history: PropTypes.object.isRequired }; export default App; diff --git a/frontend/src/Components/Page/ErrorPage.js b/frontend/src/Components/Page/ErrorPage.js index b9b3e86a2b..4f01a8a0fd 100644 --- a/frontend/src/Components/Page/ErrorPage.js +++ b/frontend/src/Components/Page/ErrorPage.js @@ -7,7 +7,6 @@ function ErrorPage(props) { const { version, isLocalStorageSupported, - hasTranslationsError, moviesError, customFiltersError, tagsError, @@ -21,8 +20,6 @@ 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 (moviesError) { errorMessage = getErrorMessage(moviesError, 'Failed to load movie from API'); } else if (customFiltersError) { @@ -55,7 +52,6 @@ function ErrorPage(props) { ErrorPage.propTypes = { version: PropTypes.string.isRequired, isLocalStorageSupported: PropTypes.bool.isRequired, - hasTranslationsError: PropTypes.bool.isRequired, moviesError: PropTypes.object, customFiltersError: PropTypes.object, tagsError: PropTypes.object, diff --git a/frontend/src/Components/Page/PageConnector.js b/frontend/src/Components/Page/PageConnector.js index 745f8fc59c..4c25771d3e 100644 --- a/frontend/src/Components/Page/PageConnector.js +++ b/frontend/src/Components/Page/PageConnector.js @@ -232,7 +232,6 @@ class PageConnector extends Component { render() { const { - hasTranslationsError, isPopulated, hasError, dispatchFetchMovies, @@ -247,12 +246,11 @@ class PageConnector extends Component { ...otherProps } = this.props; - if (hasTranslationsError || hasError || !this.state.isLocalStorageSupported) { + if (hasError || !this.state.isLocalStorageSupported) { return ( ); } @@ -273,7 +271,6 @@ 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 index 79e7c35662..696d5ad282 100644 --- a/frontend/src/Utilities/String/translate.js +++ b/frontend/src/Utilities/String/translate.js @@ -1,28 +1,23 @@ import createAjaxRequest from 'Utilities/createAjaxRequest'; function getTranslations() { - return createAjaxRequest({ - global: false, + let localization = null; + const ajaxOptions = { + async: false, dataType: 'json', - url: '/localization' - }).request; -} - -let translations = {}; - -export function fetchTranslations() { - return new Promise(async(resolve) => { - try { - const data = await getTranslations(); - translations = data.Strings; - - resolve(true); - } catch (error) { - resolve(false); + url: '/localization', + success: function(data) { + localization = data.Strings; } - }); + }; + + createAjaxRequest(ajaxOptions); + + return localization; } +const translations = getTranslations(); + export default function translate(key, args) { const translation = translations[key] || key; diff --git a/frontend/src/index.js b/frontend/src/index.js index 8ed0414c65..59911154e9 100644 --- a/frontend/src/index.js +++ b/frontend/src/index.js @@ -2,7 +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'; import './polyfills'; @@ -11,14 +11,11 @@ import './index.css'; const history = createBrowserHistory(); const store = createAppStore(history); -const hasTranslationsError = !await fetchTranslations(); -const { default: App } = await import('./App/App'); render( , document.getElementById('root') );