Change i18n to just use single language setting

This commit is contained in:
Infinite
2020-02-08 22:02:07 +01:00
parent e6d9d385a7
commit 3a0420b79e
10 changed files with 13 additions and 61 deletions

View File

@@ -25,14 +25,14 @@ library.add(fas);
export const App: React.FC = () => {
const config = StashService.useConfiguration();
const locale = config.data?.configuration?.interface?.locale ?? 'US';
const language = config.data?.configuration?.interface?.language ?? 'en';
const messages = flattenMessages((locales as any)[language] ?? locales.en);
const language = config.data?.configuration?.interface?.language ?? 'en-US';
const messageLanguage = language.slice(0,2);
const messages = flattenMessages((locales as any)[messageLanguage]);
return (
<div className="bp3-dark">
<ErrorBoundary>
<IntlProvider locale={locale} messages={messages}>
<IntlProvider locale={language} messages={messages}>
<ToastProvider>
<MainNavbar />
<div className="main container-fluid">