diff --git a/src/components/modals/main/settings/sections/background/Background.jsx b/src/components/modals/main/settings/sections/background/Background.jsx index 56241849..2f74399e 100644 --- a/src/components/modals/main/settings/sections/background/Background.jsx +++ b/src/components/modals/main/settings/sections/background/Background.jsx @@ -149,6 +149,7 @@ export default class BackgroundSettings extends React.PureComponent { +

{background.source.title}

this.setState({ backgroundType: value })} category='background'> diff --git a/src/components/widgets/background/PhotoInformation.jsx b/src/components/widgets/background/PhotoInformation.jsx index 5fd59f45..a763a828 100644 --- a/src/components/widgets/background/PhotoInformation.jsx +++ b/src/components/widgets/background/PhotoInformation.jsx @@ -49,25 +49,26 @@ export default function PhotoInformation(props) { return (

{photo} {credit}

- -
- -

{language.information}

-
- - {props.info.location || 'N/A'} - - {props.info.camera || 'N/A'} - - {props.info.resolution || 'N/A'} - - {photographer} - {(localStorage.getItem('downloadbtn') === 'true') && !props.info.offline && !props.info.photographerURL ? - <> - - downloadImage(props.info)}>{language.download} - : null} -
+ {localStorage.getItem('photoInformation') !== 'false' ? <> +
+ +

{language.information}

+
+ + {props.info.location || 'N/A'} + + {props.info.camera || 'N/A'} + + {props.info.resolution || 'N/A'} + + {photographer} + {(localStorage.getItem('downloadbtn') === 'true') && !props.info.offline && !props.info.photographerURL ? + <> + + downloadImage(props.info)}>{language.download} + : null} +
+ : null}
); } diff --git a/src/index.js b/src/index.js index 9d1cb06e..0aaa7872 100644 --- a/src/index.js +++ b/src/index.js @@ -8,8 +8,7 @@ import './scss/index.scss'; // the toast css is based on default so we need to import it import 'react-toastify/dist/ReactToastify.min.css'; -import '@fontsource/lexend-deca/latin-400.css'; -import '@fontsource/montserrat/cyrillic-500.css'; +import '@fontsource/lexend-deca/400.css'; // language import merge from '@material-ui/utils/esm/deepmerge'; @@ -23,6 +22,11 @@ if (languagecode === 'en') { window.languagecode = 'en_GB'; } +// only load font if needed +if (languagecode === 'ru') { + require('@fontsource/montserrat/cyrillic-500.css'); +} + // these are merged so if a string is untranslated it doesn't break mue window.language = merge(require('./translations/en_GB.json'), require(`./translations/${window.languagecode}.json`)); diff --git a/src/translations/de_DE.json b/src/translations/de_DE.json index 67c00aef..c0a1b697 100644 --- a/src/translations/de_DE.json +++ b/src/translations/de_DE.json @@ -131,6 +131,7 @@ "title": "Hintergrund", "ddg_proxy": "DuckDuckGo Bilder Proxy verwenden", "transition": "Weicher übergang", + "photo_information": "Show photo information", "category": "Kategorie", "buttons": { "title": "Schaltflächen", diff --git a/src/translations/en_GB.json b/src/translations/en_GB.json index 488e2e08..0a8517c8 100644 --- a/src/translations/en_GB.json +++ b/src/translations/en_GB.json @@ -131,6 +131,7 @@ "title": "Background", "ddg_proxy": "Use DuckDuckGo image proxy", "transition": "Fade-in transition", + "photo_information": "Show photo information", "category": "Category", "buttons": { "title": "Buttons", diff --git a/src/translations/en_US.json b/src/translations/en_US.json index 289c5e19..4e53d480 100644 --- a/src/translations/en_US.json +++ b/src/translations/en_US.json @@ -131,6 +131,7 @@ "title": "Background", "ddg_proxy": "Use DuckDuckGo image proxy", "transition": "Fade-in transition", + "photo_information": "Show photo information", "category": "Category", "buttons": { "title": "Buttons", diff --git a/src/translations/es.json b/src/translations/es.json index ee501081..30670127 100644 --- a/src/translations/es.json +++ b/src/translations/es.json @@ -131,6 +131,7 @@ "title": "Fondo", "ddg_proxy": "Utilizar el proxy de imágenes de DuckDuckGo", "transition": "Transición fade-in", + "photo_information": "Show photo information", "category": "Categoría", "buttons": { "title": "Botones", diff --git a/src/translations/fr.json b/src/translations/fr.json index 9cd771e5..c3a24614 100644 --- a/src/translations/fr.json +++ b/src/translations/fr.json @@ -131,6 +131,7 @@ "title": "Fond", "ddg_proxy": "Utiliser le proxy d'image DuckDuckGo", "transition": "Transition en fondu", + "photo_information": "Show photo information", "category": "Catégorie", "buttons": { "title": "Boutons", diff --git a/src/translations/nl.json b/src/translations/nl.json index e25709ae..ebc0e9b2 100644 --- a/src/translations/nl.json +++ b/src/translations/nl.json @@ -131,6 +131,7 @@ "title": "Achtergrond", "ddg_proxy": "Use DuckDuckGo image proxy", "transition": "Fade-in transition", + "photo_information": "Show photo information", "category": "Category", "buttons": { "title": "Buttons", diff --git a/src/translations/no.json b/src/translations/no.json index 561f20f2..3dbfc52a 100644 --- a/src/translations/no.json +++ b/src/translations/no.json @@ -131,6 +131,7 @@ "title": "Bakgrunn", "ddg_proxy": "Use DuckDuckGo image proxy", "transition": "Fade-in transition", + "photo_information": "Show photo information", "category": "Category", "buttons": { "title": "Buttons", diff --git a/src/translations/ru.json b/src/translations/ru.json index 45a5bb35..39b0845e 100644 --- a/src/translations/ru.json +++ b/src/translations/ru.json @@ -131,6 +131,7 @@ "title": "Фон", "ddg_proxy": "Use DuckDuckGo image proxy", "transition": "Fade-in transition", + "photo_information": "Show photo information", "category": "Category", "buttons": { "title": "Buttons", diff --git a/src/translations/zh_CN.json b/src/translations/zh_CN.json index e7814df6..86ece73d 100644 --- a/src/translations/zh_CN.json +++ b/src/translations/zh_CN.json @@ -131,6 +131,7 @@ "title": "背景", "ddg_proxy": "Use DuckDuckGo image proxy", "transition": "Fade-in transition", + "photo_information": "Show photo information", "category": "Category", "buttons": { "title": "Buttons",