mirrors/mue
1
0
Fork 0
mirror of https://github.com/mue/mue.git synced 2026-07-16 21:44:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix #101

Browse Source
This commit is contained in:
David Ralph
2020-09-16 18:52:22 +01:00
parent 4dfe05ac8a
commit 9db5150b07
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/App.jsx
View File

@@ -13,6 +13,7 @@ import Navbar from './components/Navbar';
import SettingsFunctions from './modules/settingsFunctions';
import { ToastContainer } from 'react-toastify';
import Modal from 'react-modal';
import Merge from 'lodash.merge';
import RoomIcon from '@material-ui/icons/Room';
// Modals are lazy loaded as a user won't use them every time they open a tab
@@ -47,7 +48,9 @@ export default class App extends React.PureComponent {
let overlayClassList = 'Overlay';
if (localStorage.getItem('animations') === 'true') overlayClassList = 'Overlay modal-animation';
const language = require(`./translations/${localStorage.getItem('language')}.json`);
let language = require(`./translations/${localStorage.getItem('language')}.json`);
const en = require('./translations/en.json');
language = Merge(en, language);
const theme = localStorage.getItem('theme');
if (theme) {