From a035b70841bae5c1063917147a6bf1e090206f21 Mon Sep 17 00:00:00 2001 From: David Ralph Date: Fri, 15 Sep 2023 23:28:56 +0100 Subject: [PATCH] chore(fix): deprecate pexels, explanation to come --- .../sections/background/Background.jsx | 6 +-- .../widgets/background/Background.jsx | 6 +-- .../widgets/background/PhotoInformation.jsx | 51 ++++++------------- src/translations/de_DE.json | 1 - src/translations/en_GB.json | 1 - src/translations/en_US.json | 1 - src/translations/es.json | 1 - src/translations/es_419.json | 1 - src/translations/fr.json | 1 - src/translations/id_ID.json | 1 - src/translations/nl.json | 1 - src/translations/no.json | 1 - src/translations/pt.json | 1 - src/translations/pt_BR.json | 1 - src/translations/ru.json | 1 - src/translations/tr_TR.json | 1 - src/translations/zh_CN.json | 1 - 17 files changed, 19 insertions(+), 58 deletions(-) diff --git a/src/components/modals/main/settings/sections/background/Background.jsx b/src/components/modals/main/settings/sections/background/Background.jsx index c324918c..fd670cde 100644 --- a/src/components/modals/main/settings/sections/background/Background.jsx +++ b/src/components/modals/main/settings/sections/background/Background.jsx @@ -180,11 +180,7 @@ export default class BackgroundSettings extends PureComponent { { name: 'Unsplash', value: 'unsplash', - }, - { - name: 'Pexels', - value: 'pexels', - }, + } ]} name="backgroundAPI" category="background" diff --git a/src/components/widgets/background/Background.jsx b/src/components/widgets/background/Background.jsx index 5deb487f..c728f867 100644 --- a/src/components/widgets/background/Background.jsx +++ b/src/components/widgets/background/Background.jsx @@ -107,10 +107,8 @@ export default class Background extends PureComponent { let requestURL, data; switch (backgroundAPI) { case 'unsplash': - requestURL = `${variables.constants.API_URL}/images/unsplash?categories=${apiCategories}&quality=${apiQuality}`; - break; case 'pexels': - requestURL = `${variables.constants.API_URL}/images/pexels?quality=${apiQuality}`; + requestURL = `${variables.constants.API_URL}/images/unsplash?categories=${apiCategories}&quality=${apiQuality}`; break; // Defaults to Mue default: @@ -129,7 +127,7 @@ export default class Background extends PureComponent { let photoURL, photographerURL; - if (backgroundAPI === 'unsplash' || backgroundAPI === 'pexels') { + if (backgroundAPI === 'unsplash') { photoURL = data.photo_page; photographerURL = data.photographer_page; } diff --git a/src/components/widgets/background/PhotoInformation.jsx b/src/components/widgets/background/PhotoInformation.jsx index 32be5282..232fcf63 100644 --- a/src/components/widgets/background/PhotoInformation.jsx +++ b/src/components/widgets/background/PhotoInformation.jsx @@ -68,48 +68,29 @@ function PhotoInformation({ info, url, api }) { return null; } - // remove unsplash and pexels text + // remove unsplash text const unsplash = variables.getMessage('widgets.background.unsplash'); - const pexels = variables.getMessage('widgets.background.pexels'); let credit = info.credit; let photo = variables.getMessage('widgets.background.credit'); - // unsplash and pexels credit + // unsplash credit if (info.photographerURL && info.photographerURL !== '' && !info.offline && api) { - if (api === 'unsplash') { - photo = ( - - {photo} + photo = ( + + {photo} + + ); + credit = ( + <> + + {info.credit} + {' '} + + {unsplash} - ); - credit = ( - <> - - {info.credit} - {' '} - - {unsplash} - - - ); - } else { - photo = ( - - {photo} - - ); - credit = ( - <> - - {info.credit} - {' '} - - {pexels} - - - ); - } + + ); } const ddgProxy = localStorage.getItem('ddgProxy') === 'true'; diff --git a/src/translations/de_DE.json b/src/translations/de_DE.json index e2840ad6..dc87c9e8 100644 --- a/src/translations/de_DE.json +++ b/src/translations/de_DE.json @@ -658,7 +658,6 @@ "information": "Informationen", "likes": "Likes", "location": "Location", - "pexels": "pexels.com", "resolution": "Resolution", "source": "Source", "unsplash": "unsplash.com", diff --git a/src/translations/en_GB.json b/src/translations/en_GB.json index 801fe2b6..b8aab137 100644 --- a/src/translations/en_GB.json +++ b/src/translations/en_GB.json @@ -13,7 +13,6 @@ "background": { "credit": "Photo by", "unsplash": "on Unsplash", - "pexels": "on Pexels", "information": "Information", "download": "Download", "downloads": "Downloads", diff --git a/src/translations/en_US.json b/src/translations/en_US.json index 3a955821..bd9627a0 100644 --- a/src/translations/en_US.json +++ b/src/translations/en_US.json @@ -658,7 +658,6 @@ "information": "Information", "likes": "Likes", "location": "Location", - "pexels": "on Pexels", "resolution": "Resolution", "source": "Source", "unsplash": "on Unsplash", diff --git a/src/translations/es.json b/src/translations/es.json index fc6ca89f..3927bf5d 100644 --- a/src/translations/es.json +++ b/src/translations/es.json @@ -658,7 +658,6 @@ "information": "Información", "likes": "Likes", "location": "Location", - "pexels": "en Pexels", "resolution": "Resolution", "source": "Source", "unsplash": "en Unsplash", diff --git a/src/translations/es_419.json b/src/translations/es_419.json index 04bfc5ec..ae1eb4e5 100644 --- a/src/translations/es_419.json +++ b/src/translations/es_419.json @@ -13,7 +13,6 @@ "background": { "credit": "Foto por", "unsplash": "en Unsplash", - "pexels": "en Pexels", "information": "Información", "download": "Descargar", "downloads": "Descargas", diff --git a/src/translations/fr.json b/src/translations/fr.json index c970d81d..734d5714 100644 --- a/src/translations/fr.json +++ b/src/translations/fr.json @@ -658,7 +658,6 @@ "information": "Information", "likes": "Likes", "location": "Location", - "pexels": "sur Pexels", "resolution": "Resolution", "source": "Source", "unsplash": "sur Unsplash", diff --git a/src/translations/id_ID.json b/src/translations/id_ID.json index 2cc95946..f6d4a8b1 100644 --- a/src/translations/id_ID.json +++ b/src/translations/id_ID.json @@ -13,7 +13,6 @@ "background": { "credit": "Foto oleh", "unsplash": "di Unsplash", - "pexels": "di Pexels", "information": "Informasi", "download": "Unduh", "downloads": "Downloads", diff --git a/src/translations/nl.json b/src/translations/nl.json index ac7e2091..02867f35 100644 --- a/src/translations/nl.json +++ b/src/translations/nl.json @@ -658,7 +658,6 @@ "information": "Information", "likes": "houdt van", "location": "Location", - "pexels": "on Pexels", "resolution": "Resolution", "source": "Source", "unsplash": "on Unsplash", diff --git a/src/translations/no.json b/src/translations/no.json index 55f1cbf9..ae6a4849 100644 --- a/src/translations/no.json +++ b/src/translations/no.json @@ -658,7 +658,6 @@ "information": "Information", "likes": "Likes", "location": "Location", - "pexels": "on Pexels", "resolution": "Resolution", "source": "Source", "unsplash": "on Unsplash", diff --git a/src/translations/pt.json b/src/translations/pt.json index 5a931d24..0131b7ad 100644 --- a/src/translations/pt.json +++ b/src/translations/pt.json @@ -658,7 +658,6 @@ "information": "Informação", "likes": "Curtidas", "location": "Localização", - "pexels": "em Pexels", "resolution": "Resolução", "source": "Fonte", "unsplash": "no Unsplash", diff --git a/src/translations/pt_BR.json b/src/translations/pt_BR.json index 316b54c9..5f00e756 100644 --- a/src/translations/pt_BR.json +++ b/src/translations/pt_BR.json @@ -658,7 +658,6 @@ "information": "Informação", "likes": "Curtidas", "location": "Localização", - "pexels": "em Pexels", "resolution": "Resolução", "source": "Fonte", "unsplash": "no Unsplash", diff --git a/src/translations/ru.json b/src/translations/ru.json index fd064194..b88097f8 100644 --- a/src/translations/ru.json +++ b/src/translations/ru.json @@ -658,7 +658,6 @@ "information": "Information", "likes": "Нравится", "location": "Локация", - "pexels": "на Pexels", "resolution": "Разрешение", "source": "Источник", "unsplash": "на Unsplash", diff --git a/src/translations/tr_TR.json b/src/translations/tr_TR.json index 01bdeed1..5b2ee51f 100644 --- a/src/translations/tr_TR.json +++ b/src/translations/tr_TR.json @@ -658,7 +658,6 @@ "information": "Bilgilendirme", "likes": "Beğeni", "location": "Konum", - "pexels": ", Pexels", "resolution": "Çözünürlük", "source": "Kaynak", "unsplash": ", Unsplash", diff --git a/src/translations/zh_CN.json b/src/translations/zh_CN.json index 44c32349..b75e754f 100644 --- a/src/translations/zh_CN.json +++ b/src/translations/zh_CN.json @@ -658,7 +658,6 @@ "information": "信息", "likes": "Likes", "location": "Location", - "pexels": "@ Pexels", "resolution": "Resolution", "source": "Source", "unsplash": "@ Unsplash",