diff --git a/src/components/modals/main/settings/Radio.jsx b/src/components/modals/main/settings/Radio.jsx index e14536e7..791744c9 100644 --- a/src/components/modals/main/settings/Radio.jsx +++ b/src/components/modals/main/settings/Radio.jsx @@ -31,9 +31,10 @@ export default class Radio extends PureComponent { localStorage.getItem('tabName') === variables.language.getMessage(variables.languagecode, 'tabname') ) { + // todo: fix this it doesn't work and shows as undefined localStorage.setItem( 'tabName', - require(`translations/${value.replace('-', '_')}.json`).tabname, + import(`../../../../translations/${value.replace('-', '_')}.json`).tabname, ); } } diff --git a/src/components/modals/main/settings/sections/Search.jsx b/src/components/modals/main/settings/sections/Search.jsx index db5b5422..ed4d534f 100644 --- a/src/components/modals/main/settings/sections/Search.jsx +++ b/src/components/modals/main/settings/sections/Search.jsx @@ -11,8 +11,8 @@ import SettingsItem from '../SettingsItem'; import EventBus from 'modules/helpers/eventbus'; -import * as searchEngines from 'components/widgets/search/search_engines.json'; -import * as autocompleteProviders from 'components/widgets/search/autocomplete_providers.json'; +import searchEngines from 'components/widgets/search/search_engines.json'; +import autocompleteProviders from 'components/widgets/search/autocomplete_providers.json'; export default class SearchSettings extends PureComponent { getMessage = (text) => variables.language.getMessage(variables.languagecode, text); diff --git a/src/components/modals/welcome/WelcomeSections.jsx b/src/components/modals/welcome/WelcomeSections.jsx index 32ebd51c..d7a4cae7 100644 --- a/src/components/modals/welcome/WelcomeSections.jsx +++ b/src/components/modals/welcome/WelcomeSections.jsx @@ -9,8 +9,8 @@ import FileUpload from '../main/settings/FileUpload'; import { loadSettings } from 'modules/helpers/settings'; import { importSettings } from 'modules/helpers/settings/modals'; -import * as default_settings from 'modules/default_settings.json'; -import * as languages from 'modules/languages.json'; +import default_settings from 'modules/default_settings.json'; +import languages from 'modules/languages.json'; export default class WelcomeSections extends PureComponent { getMessage = (text) => variables.language.getMessage(variables.languagecode, text); diff --git a/src/components/widgets/background/PhotoInformation.jsx b/src/components/widgets/background/PhotoInformation.jsx index 4d28a344..bab7eddc 100644 --- a/src/components/widgets/background/PhotoInformation.jsx +++ b/src/components/widgets/background/PhotoInformation.jsx @@ -6,10 +6,10 @@ import { MdLocationOn, MdPhotoCamera, MdCrop as Resolution, - MdPerson as Photographer, MdGetApp as Download, MdVisibility as Views, MdIosShare as Share, + MdSource as Source, } from 'react-icons/md'; import Tooltip from '../../helpers/tooltip/Tooltip'; import ShareModal from '../../helpers/sharemodal/ShareModal'; @@ -312,8 +312,8 @@ export default function PhotoInformation({ info, url, api }) {