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

Remove lodash.merge with custom merge fucntion, default to "en" language if null

Browse Source
This commit is contained in:
August
2020-09-25 07:07:16 -07:00
parent 9bd4f99006
commit 7e2772812c
3 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/App.jsx
View File

@@ -13,7 +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 { merge } from './modules/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
@@ -48,9 +48,9 @@ export default class App extends React.PureComponent {
let overlayClassList = 'Overlay';
if (localStorage.getItem('animations') === 'true') overlayClassList = 'Overlay modal-animation';
let language = require(`./translations/${localStorage.getItem('language')}.json`);
let language = require(`./translations/${localStorage.getItem('language') || 'en'}.json`);
const en = require('./translations/en.json');
language = Merge(en, language);
language = merge(en, language);
const theme = localStorage.getItem('theme');
if (theme) {