diff --git a/src/components/modals/main/settings/FileUpload.jsx b/src/components/modals/main/settings/FileUpload.jsx
index 0d089841..7056d1ae 100644
--- a/src/components/modals/main/settings/FileUpload.jsx
+++ b/src/components/modals/main/settings/FileUpload.jsx
@@ -1,7 +1,11 @@
+import variables from 'modules/variables';
import { PureComponent } from 'react';
import { toast } from 'react-toastify';
export default class FileUpload extends PureComponent {
+ getMessage = (languagecode, text) => variables.language.getMessage(languagecode, text);
+ languagecode = variables.languagecode;
+
componentDidMount() {
document.getElementById(this.props.id).onchange = (e) => {
const reader = new FileReader();
@@ -12,7 +16,7 @@ export default class FileUpload extends PureComponent {
} else {
// background upload
if (file.size > 2000000) {
- return toast(window.language.modals.main.file_upload_error);
+ return toast(this.getMessage(this.languagecode, 'modals.main.file_upload_error'));
}
reader.readAsDataURL(file);
diff --git a/src/components/modals/welcome/WelcomeSections.jsx b/src/components/modals/welcome/WelcomeSections.jsx
index a301a836..fd6393fe 100644
--- a/src/components/modals/welcome/WelcomeSections.jsx
+++ b/src/components/modals/welcome/WelcomeSections.jsx
@@ -108,7 +108,6 @@ export default class WelcomeSections extends PureComponent {
}
render() {
- const language = window.language.modals.welcome;
let tabContent;
const intro = (
@@ -195,7 +194,7 @@ export default class WelcomeSections extends PureComponent {
this.props.switchTab(1)}>{this.getMessage(this.languagecode, 'modals.main.settings.sections.language.title')}: {languages.find((i) => i.value === localStorage.getItem('language')).name}
this.props.switchTab(3)}>{this.getMessage(this.languagecode, 'modals.main.settings.sections.appearance.theme.title')}: {this.getSetting('theme')}
- {(this.state.importedSettings.length !== 0) ?
this.props.switchTab(2)}>{language.sections.final.imported} {this.state.importedSettings.length} {this.getMessage(this.languagecode, 'modals.welcome.sections.final.settings')}
: null}
+ {(this.state.importedSettings.length !== 0) ?
this.props.switchTab(2)}>{this.getMessage(this.languagecode, 'modals.main.settings.sections.final.imported')} {this.state.importedSettings.length} {this.getMessage(this.languagecode, 'modals.welcome.sections.final.settings')}
: null}
>
);
diff --git a/src/modules/helpers/settings/index.js b/src/modules/helpers/settings/index.js
index 592b3b7f..73580885 100644
--- a/src/modules/helpers/settings/index.js
+++ b/src/modules/helpers/settings/index.js
@@ -1,8 +1,12 @@
+import variables from 'modules/variables';
import experimentalInit from '../experimental';
const defaultSettings = require('modules/default_settings.json');
const languages = require('modules/languages.json');
+const getMessage = (languagecode, text) => variables.language.getMessage(languagecode, text);
+const languagecode = variables.languagecode;
+
export function setDefaultSettings(reset) {
localStorage.clear();
defaultSettings.forEach((element) => localStorage.setItem(element.name, element.value));
@@ -17,7 +21,7 @@ export function setDefaultSettings(reset) {
localStorage.setItem('language', 'en_GB');
}
- localStorage.setItem('tabName', window.language.tabname);
+ localStorage.setItem('tabName', getMessage(languagecode, 'tabName'));
if (reset) {
localStorage.setItem('showWelcome', false);
@@ -43,7 +47,7 @@ export function loadSettings(hotreload) {
document.body.classList.remove('dark');
}
- document.title = localStorage.getItem('tabName') || window.language.tabname;
+ document.title = localStorage.getItem('tabName') || getMessage(languagecode, 'tabName');
if (hotreload === true) {
// remove old custom stuff and add new