From 9db5150b072d29de0c05e0e28f99d6399ceaadcd Mon Sep 17 00:00:00 2001
From: David Ralph <ohlookitsderpy@protonmail.com>
Date: Wed, 16 Sep 2020 18:52:22 +0100
Subject: [PATCH] fix #101

---
 package.json | 1 +
 src/App.jsx  | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 20016efb..dc61e758 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
     "@material-ui/icons": "^4.9.1",
     "@muetab/quotes": "^1.0.0",
     "detect-browser-language": "0.0.2",
+    "lodash.merge": "^4.6.2",
     "react": "^16.13.1",
     "react-clock": "^2.4.0",
     "react-dom": "^16.13.1",
diff --git a/src/App.jsx b/src/App.jsx
index bdf3ffae..2f33aed0 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -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) {