diff --git a/src/global/AppLoading.tsx b/src/global/AppLoading.tsx index 639a927..65d5eb5 100644 --- a/src/global/AppLoading.tsx +++ b/src/global/AppLoading.tsx @@ -10,6 +10,6 @@ {/* Loading hint */} {/* NOTE: This is not translated, as usually this component is shown when the translations are being loaded! */} - Loading KristWeb... + setsetstsetsetestLoading KristWeb... ; } diff --git a/src/index.tsx b/src/index.tsx index a28237d..754da8a 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -2,6 +2,7 @@ // This file is part of KristWeb 2 under GPL-3.0. // Full details: https://github.com/tmpim/KristWeb2/blob/master/LICENSE.txt import "./utils/setup"; +import { i18nLoader } from "./utils/i18n"; import ReactDOM from "react-dom"; @@ -14,17 +15,20 @@ // import reportWebVitals from "./reportWebVitals"; debug("============================ APP STARTING ============================"); -debug("performing initial render"); -ReactDOM.render( - // FIXME: ant-design still has a few incompatibilities with StrictMode, most - // notably in rc-menu. Keep an eye on the issue to track progress and - // prepare for React 17: - // https://github.com/ant-design/ant-design/issues/26136 - // - , - // , - document.getElementById("root") -); +debug("waiting for i18n first"); +i18nLoader.then(() => { + debug("performing initial render"); + ReactDOM.render( + // FIXME: ant-design still has a few incompatibilities with StrictMode, most + // notably in rc-menu. Keep an eye on the issue to track progress and + // prepare for React 17: + // https://github.com/ant-design/ant-design/issues/26136 + // + , + // , + document.getElementById("root") + ); +}); // If you want to start measuring performance in your app, pass a function // to log results (for example: reportWebVitals(console.log)) diff --git a/src/utils/i18n.ts b/src/utils/i18n.ts index 240d231..83b3770 100644 --- a/src/utils/i18n.ts +++ b/src/utils/i18n.ts @@ -50,7 +50,7 @@ "contributors": [] }};*/ -i18n +export const i18nLoader = i18n .use(Backend) .use(LanguageDetector) .use(initReactI18next)