From 16419ca775e8896360a9c943a6a63ef62e0ebb8b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 23 Oct 2020 21:22:40 +0000 Subject: [PATCH 1/8] Bump react-scripts from 3.4.4 to 4.0.0 Bumps [react-scripts](https://github.com/facebook/create-react-app/tree/HEAD/packages/react-scripts) from 3.4.4 to 4.0.0. - [Release notes](https://github.com/facebook/create-react-app/releases) - [Changelog](https://github.com/facebook/create-react-app/blob/master/CHANGELOG-3.x.md) - [Commits](https://github.com/facebook/create-react-app/commits/react-scripts@4.0.0/packages/react-scripts) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7f98e098..8e22615f 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "supports-webp": "2.0.1" }, "devDependencies": { - "react-scripts": "3.4.4", + "react-scripts": "4.0.0", "node-sass": "^4.14.1" }, "scripts": { From 1f0bc275a0f030e45b8b11eea527f7d1e9232766 Mon Sep 17 00:00:00 2001 From: Pronin Egor <42776347+MrZillaGold@users.noreply.github.com> Date: Tue, 27 Oct 2020 12:41:02 +1000 Subject: [PATCH 2/8] Update ru.json --- src/translations/ru.json | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/src/translations/ru.json b/src/translations/ru.json index 5e8297fc..26e563f0 100644 --- a/src/translations/ru.json +++ b/src/translations/ru.json @@ -32,7 +32,9 @@ }, "quote": { "title": "Цитата", - "copy": "Кнопка копирования" + "copy": "Кнопка копирования", + "tweet": "Кнопка твита", + "favourite": "Кнопка для оценки" }, "background": { "title": "Фон", @@ -43,18 +45,25 @@ "custombackground": "Пользовательский фон", "customcolour": "Пользовательский цвет фона", "upload": "Загрузить", - "addcolour": "Добавить цвет" + "addcolour": "Добавить цвет", + "favourite": "Любимые", + "view": "Просмотр", + "refresh": "Обновить", + "disabled": "Выключен" }, "searchbar": { "title": "Панель поиска", - "searchengine": "Поисковый движок" + "searchengine": "Поисковый движок", + "custom": "Пользовательский поисковый движок" }, "offline": "Офлайн режим", "dark": "Тёмная тема", "experimental": { "title": "Экспериментальные настройки", "webp": "Включить WebP", - "animations": "Анимации" + "animations": "Анимации", + "voicesearch": "Поиск голосом", + "nightmode": "Автоматический ночной режим" }, "language": "Язык", "apply": "Применить", @@ -72,14 +81,17 @@ "title": "Ошибка", "content": "Не удалось подключиться к серверу" }, - "loading": "Загрузка..." + "loading": "Загрузка...", + "readblog": "Прочитайте об изменениях в блоге", + "contactsupport": "Связаться с нами" }, "toasts": { "quote": "Цитата скопирована!", "reset": "Сброшено!", "installed": "Успешно установлено", "removed": "Успешно удалено", - "error": "Что-то пошло не так" + "error": "Что-то пошло не так", + "imported": "Успешно импортировано" }, "marketplace": { "photo_packs": "Наборы фото", @@ -99,6 +111,10 @@ "buttons": { "addtomue": "Добавить в Mue", "remove": "Удалить" + }, + "quoteWarning": { + "title": "Предупреждение", + "description": "Этот пакет цитат обращается к внешнему серверу и может отслеживать вас!" } }, "offline": { @@ -113,6 +129,7 @@ "title": "Здесь пусто", "description": "Зайдите в магазин, чтобы найти что-то интересное.", "button": "Перейти" - } + }, + "sideload": "Загрузить" } } From 1647d3c520b015769d69ab34cfc47870562aad91 Mon Sep 17 00:00:00 2001 From: David Ralph Date: Tue, 27 Oct 2020 12:02:41 +0000 Subject: [PATCH 3/8] Better font system --- README.md | 2 -- package.json | 2 ++ public/fonts/LexendDeca-Regular.woff2 | Bin 30292 -> 0 bytes public/fonts/Roboto-Cyrillic.woff2 | Bin 9900 -> 0 bytes src/index.js | 3 +++ src/scss/index.scss | 10 ---------- 6 files changed, 5 insertions(+), 12 deletions(-) delete mode 100644 public/fonts/LexendDeca-Regular.woff2 delete mode 100644 public/fonts/Roboto-Cyrillic.woff2 diff --git a/README.md b/README.md index 065985f0..e74cb52c 100644 --- a/README.md +++ b/README.md @@ -143,6 +143,4 @@ Please see our [roadmap](https://github.com/mue/mue/projects) [Opera Forum](https://forums.opera.com/topic/25046/how-to-disable-completely-the-speed-dial/14) - Portions of code to add Opera support -[Google Fonts](https://fonts.google.com) - Lexend Deca and Roboto fonts - And many thanks to [Highholding](https://discord.bio/p/highholding), [Noa Shapira](#), [Roee Lupo](https://github.com/RoeeLupo), [Jeroen](#), [Glasvegas](https://twitter.com/_glasvegas), [Anders](https://github.com/FuryingFox), [Oded Shapira](https://twitter.com/dondishdev), Jacob Tyrrell and [Nikka Lai](#) for letting us use their wonderful photographs diff --git a/package.json b/package.json index 8e22615f..9a0440dd 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,8 @@ "@material-ui/core": "4.11.0", "@material-ui/icons": "4.9.1", "@muetab/quotes": "^1.0.0", + "fontsource-lexend-deca": "^3.0.10", + "fontsource-roboto": "^3.0.3", "lodash.merge": "4.6.2", "react": "16.14.0", "react-clock": "^2.4.0", diff --git a/public/fonts/LexendDeca-Regular.woff2 b/public/fonts/LexendDeca-Regular.woff2 deleted file mode 100644 index d5651fff26be861d2fd9b9c3a344c88683fda43e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30292 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 X#e}BEqX#fBKVn^P# diff --git a/public/fonts/Roboto-Cyrillic.woff2 b/public/fonts/Roboto-Cyrillic.woff2 deleted file mode 100644 index de226b374ad4d078cab153d4252d24da1d430a2f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9900 zcmV;dCR5pWPew8T0RR9104A&e5&!@I09!Z!047KP0RR9100000000000000000000 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 diff --git a/src/index.js b/src/index.js index edb71b8b..db69523f 100644 --- a/src/index.js +++ b/src/index.js @@ -5,6 +5,9 @@ import App from './App'; import './scss/index.scss'; import 'react-toastify/dist/ReactToastify.css'; // the toast css is based on default so we need to import it +import 'fontsource-lexend-deca/latin-400-normal.css'; +import 'fontsource-roboto/cyrillic-400-normal.css'; + ReactDOM.render( , document.getElementById('root') diff --git a/src/scss/index.scss b/src/scss/index.scss index 55c67406..c3771153 100644 --- a/src/scss/index.scss +++ b/src/scss/index.scss @@ -29,16 +29,6 @@ body { outline: none; } -@font-face { - font-family: 'Lexend Deca'; - src: url('/./fonts/LexendDeca-Regular.woff2') format('woff2'); -} - -@font-face { - font-family: 'Roboto'; - src: url('/./fonts/Roboto-Cyrillic.woff2') format('woff2'); -} - #center { margin-left: 2vw; margin-right: 2vw; From 4cb5d1eaae40dc4940a12bec1f2eff6cf037a2b5 Mon Sep 17 00:00:00 2001 From: Serhat Date: Wed, 7 Oct 2020 11:14:47 +0300 Subject: [PATCH 4/8] Add a bit css improvement on dropdowns --- src/scss/modules/_settings.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/scss/modules/_settings.scss b/src/scss/modules/_settings.scss index e706e458..67046816 100644 --- a/src/scss/modules/_settings.scss +++ b/src/scss/modules/_settings.scss @@ -226,12 +226,12 @@ button.remove + input[type=color].colour { } select { - background: none; + background: linear-gradient(180deg, #ffb032 0%, #dd3b67 100%); height: 34px; width: 120px; - border-image-slice: 1; - border-image-source: linear-gradient(180deg, #ffb032 0%, #dd3b67 100%); - border-left: 10px solid; + border: none; + border-radius: 5%; + padding-left: 10px; color: map-get($modal, "text"); } From cc5fa542e150e9f5ef7e1edb3eae1cc8c0ecc997 Mon Sep 17 00:00:00 2001 From: Serhat Date: Tue, 27 Oct 2020 17:59:45 +0300 Subject: [PATCH 5/8] Dropdowns are now standalone class --- src/components/modals/settings/Dropdown.jsx | 20 ++++++++++ .../settings/sections/BackgroundSettings.jsx | 17 +++++---- .../settings/sections/LanguageSettings.jsx | 23 ++++++----- .../settings/sections/SearchSettings.jsx | 38 ++++++++++--------- 4 files changed, 65 insertions(+), 33 deletions(-) create mode 100644 src/components/modals/settings/Dropdown.jsx diff --git a/src/components/modals/settings/Dropdown.jsx b/src/components/modals/settings/Dropdown.jsx new file mode 100644 index 00000000..6923da32 --- /dev/null +++ b/src/components/modals/settings/Dropdown.jsx @@ -0,0 +1,20 @@ +import React from 'react'; + +export default class Dropdown extends React.PureComponent { + getLabel() { + return this.props.label ? : null; + } + + render() { + return ( + <> + {this.getLabel()} +
+ +
+ + ); + } +} \ No newline at end of file diff --git a/src/components/modals/settings/sections/BackgroundSettings.jsx b/src/components/modals/settings/sections/BackgroundSettings.jsx index dae31f65..d52931b2 100644 --- a/src/components/modals/settings/sections/BackgroundSettings.jsx +++ b/src/components/modals/settings/sections/BackgroundSettings.jsx @@ -1,6 +1,7 @@ import React from 'react'; import { toast } from 'react-toastify'; import Checkbox from '../Checkbox'; +import Dropdown from '../Dropdown'; import Section from '../Section'; export default class BackgroundSettings extends React.PureComponent { @@ -160,13 +161,15 @@ export default class BackgroundSettings extends React.PureComponent {
    - - + localStorage.setItem('backgroundAPI', document.getElementById('backgroundAPI').value)} + > + + +

    {this.props.language.background.blur} ({this.state.blur}%) this.resetItem('blur')}>{this.props.language.reset}

    diff --git a/src/components/modals/settings/sections/LanguageSettings.jsx b/src/components/modals/settings/sections/LanguageSettings.jsx index 3c058006..2c9717cf 100644 --- a/src/components/modals/settings/sections/LanguageSettings.jsx +++ b/src/components/modals/settings/sections/LanguageSettings.jsx @@ -1,18 +1,23 @@ import React from 'react'; +import Dropdown from '../Dropdown'; export default class LanguageSettings extends React.PureComponent { render() { return ( -
    +

    {this.props.language.language}

    - -
    + localStorage.setItem('language', document.getElementById('language').value)} + > + + + + + + +
    ); } } \ No newline at end of file diff --git a/src/components/modals/settings/sections/SearchSettings.jsx b/src/components/modals/settings/sections/SearchSettings.jsx index 0003754b..e9f0ecde 100644 --- a/src/components/modals/settings/sections/SearchSettings.jsx +++ b/src/components/modals/settings/sections/SearchSettings.jsx @@ -2,6 +2,7 @@ import React from 'react'; import SettingsFunctions from '../../../../modules/settingsFunctions'; import { toast } from 'react-toastify'; import Section from '../Section'; +import Dropdown from '../Dropdown'; const searchEngines = require('../../../../modules/searchEngines.json'); @@ -25,23 +26,26 @@ export default class SearchSettings extends React.PureComponent { render() { return ( - -
    -
      - - -
    -
      -

      {this.props.language.searchbar.custom} this.resetSearch()}>{this.props.language.reset}

      - -
    -
    -     + +
    +
      + SettingsFunctions.setSearchEngine(document.getElementById('searchEngine').value)} + > + {searchEngines.map((engine) => + + )} + + +
    +
      +

      {this.props.language.searchbar.custom} this.resetSearch()}>{this.props.language.reset}

      + +
    +
    +     ); } } \ No newline at end of file From d455e4b63bb472c7a2c3c6b08170ae321db05730 Mon Sep 17 00:00:00 2001 From: Serhat Date: Tue, 27 Oct 2020 18:00:39 +0300 Subject: [PATCH 6/8] Add a bit more css improvement on dropdown --- src/scss/index.scss | 1 + src/scss/modules/_dropdown.scss | 16 ++++++++++++++++ src/scss/modules/_settings.scss | 14 -------------- 3 files changed, 17 insertions(+), 14 deletions(-) create mode 100644 src/scss/modules/_dropdown.scss diff --git a/src/scss/index.scss b/src/scss/index.scss index c3771153..3acd0e2d 100644 --- a/src/scss/index.scss +++ b/src/scss/index.scss @@ -13,6 +13,7 @@ @import 'modules/marketplace'; @import 'modules/checkbox'; @import 'modules/buttons'; +@import 'modules/dropdown'; @import 'modules/welcome'; body { diff --git a/src/scss/modules/_dropdown.scss b/src/scss/modules/_dropdown.scss new file mode 100644 index 00000000..c33a0f8a --- /dev/null +++ b/src/scss/modules/_dropdown.scss @@ -0,0 +1,16 @@ +.dropdown { + select { + background: linear-gradient(180deg, #ffb032 0%, #dd3b67 100%); + height: 34px; + width: 120px; + color: map-get($modal, "text"); + + border-image-source: linear-gradient(180deg, #ffb032 0%, #dd3b67 100%); + border-image-slice: 1; + border-width: 3px 4px; + } + + select#language { + float: right; + } +} diff --git a/src/scss/modules/_settings.scss b/src/scss/modules/_settings.scss index 67046816..9373e0ed 100644 --- a/src/scss/modules/_settings.scss +++ b/src/scss/modules/_settings.scss @@ -225,20 +225,6 @@ button.remove + input[type=color].colour { margin-left: 7px; } -select { - background: linear-gradient(180deg, #ffb032 0%, #dd3b67 100%); - height: 34px; - width: 120px; - border: none; - border-radius: 5%; - padding-left: 10px; - color: map-get($modal, "text"); -} - -select#language { - float: right; -} - #customBackgroundColour { cursor: pointer; } From ac60d54950c63e0f04e422e0932b7c9fed762e10 Mon Sep 17 00:00:00 2001 From: Vicente015 <33096355+Vicente015@users.noreply.github.com> Date: Wed, 28 Oct 2020 13:58:53 +0000 Subject: [PATCH 7/8] Spanish translation --- src/translations/es.json | 135 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) create mode 100644 src/translations/es.json diff --git a/src/translations/es.json b/src/translations/es.json new file mode 100644 index 00000000..3b96bf14 --- /dev/null +++ b/src/translations/es.json @@ -0,0 +1,135 @@ +{ + "greeting": { + "morning": "Buenos días", + "afternoon": "Buenas tardes", + "evening": "Buenas noches", + "christmas": "Feliz Navidad", + "newyear": "Feliz año nuevo", + "halloween": "Feliz Halloween" + }, + "credit": "Foto por", + "search": "Buscar", + "modals": { + "title": "Opciones", + "settings": "Ajustes", + "addons": "Mis complementos", + "marketplace": "Tienda" + }, + "settings": { + "time": { + "title": "Tiempo", + "seconds": "Segundos", + "twentyfourhour": "24 Horas", + "ampm": "AM/PM (12 horas)", + "zero": "Sin ceros", + "analog": "Analógico" + }, + "greeting": { + "title": "Saludos", + "events": "Eventos", + "default": "Mensaje del saludo por defecto", + "name": "Nombre para el saludo" + }, + "quote": { + "title": "Cita", + "copy": "Botón de copiar", + "tweet": "Botón de Tweet", + "favourite": "Botón de favoritos" + }, + "background": { + "title": "Fondo", + "API": "Fondos API", + "blur": "Ajustar difuminado", + "brightness": "Ajustar brillo", + "customURL": "URL del fondo personalizado", + "custombackground": "Fondo personalizado", + "customcolour": "Color del fondo personalizado", + "upload": "Subir", + "addcolour": "Añadir color", + "favourite": "Favorito", + "view": "Ver", + "refresh": "Refrescar", + "disabled": "Desactivado" + }, + "searchbar": { + "title": "Barra de búsqueda", + "searchengine": "Motor de búsqueda", + "custom": "URL de búsqueda personalizada" + }, + "offline": "Modo Offline", + "dark": "Tema Oscuro", + "experimental": { + "title": "Experimental", + "webp": "Activar WebP", + "animations": "Animaciones", + "voicesearch": "Búsqueda por voz", + "nightmode": "Modo nocturno automático" + }, + "language": "Lenguaje", + "apply": "Aplicar", + "reset": "Reiniciar", + "import": "Importar", + "export": "Exportar" + }, + "update": { + "title": "Actualizar", + "offline": { + "title": "Offline", + "description": "No se pueden obtener actualizaciones en modo sin conexión" + }, + "error": { + "title": "Error", + "description": "No se pudo conectar con el servidor" + }, + "loading": "Cargando...", + "readblog": "Leer en el blog aquí", + "contactsupport": "Contáctanos aquí" + }, + "toasts": { + "quote": "Cita copiada", + "reset": "Restablecido correctamente", + "installed": "Instalado correctamente", + "removed": "Retirado correctamente", + "error": "Algo salió mal", + "imported": "Importado correctamente" + }, + "marketplace": { + "photo_packs": "Paquetes de fotos", + "quote_packs": "Paquetes de citas", + "preset_settings": "Ajustes preestablecidos", + "themes": "Tema", + "product": { + "overview": "Visión general", + "information": "Información", + "last_updated": "Última actualización", + "version": "Versión", + "author": "Autor", + "notice": { + "title": "Aviso", + "description": "Para que se realice el cambio, la página debe actualizarse." + }, + "buttons": { + "addtomue": "Añadir a Mue", + "remove": "Remover" + }, + "quoteWarning": { + "title": "Advertencia", + "description": "¡Este paquete de citas solicita a servidores externos que pueden rastrearlo!" + } + }, + "offline": { + "title": "Parece que estás desconectado", + "description": "Por favor conéctate a Internet." + }, + "see_more": "Ver más" + }, + "addons": { + "added": "Añadido", + "empty": { + "title": "Está vacío aquí", + "description": "Dirígete a la tienda para agregar algunos.", + "button": "Llévame allí" + }, + "sideload": "Cargar complemento localmente" + } +} \ No newline at end of file From 2d128754760fba06f0cfd42b8bd6ded52a4ed864 Mon Sep 17 00:00:00 2001 From: David Ralph Date: Wed, 28 Oct 2020 17:02:01 +0000 Subject: [PATCH 8/8] Add Spanish to language dropdown --- README.md | 27 ++++++++++++------- package.json | 2 +- src/components/modals/settings/Dropdown.jsx | 6 ++--- .../settings/sections/LanguageSettings.jsx | 3 ++- src/modules/settingsFunctions.js | 2 +- 5 files changed, 25 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index e74cb52c..e3775765 100644 --- a/README.md +++ b/README.md @@ -88,6 +88,7 @@ Please see our [roadmap](https://github.com/mue/mue/projects)
  • Click Load unpacked (Make sure Developer Mode is on)
  • Go to the directory containing the built copy of Mue and click ok
  • Enjoy your new tab! +
    Opera (Click to expand) @@ -98,6 +99,7 @@ Please see our [roadmap](https://github.com/mue/mue/projects)
  • Click Load unpacked extension... (Make sure Developer Mode is on)
  • Go to the directory containing Mue and click ok
  • Enjoy your new tab! +
    • Firefox (Click to expand) @@ -113,20 +115,23 @@ Please see our [roadmap](https://github.com/mue/mue/projects)
    Other (Click to expand) Note: To get the full new tab experience, set your browser to open the index.html on startup and tab open! -
      -
    1. yarn run build or npm run build -
    2. Open the index.html in your browser -
    3. Enjoy your new tab! -
    +
      +
    1. yarn run build or npm run build +
    2. Open the index.html in your browser +
    3. Enjoy your new tab! +
    ## Credits -### Maintainers +### Core Team +#### Maintainers [David Ralph (ohlookitsderpy)](https://github.com/ohlookitsderpy) - Founder, Lead development, Photographer
    + [Alex Sparkes](https://github.com/alexsparkes) - Name, Lead design, Photographer
    -### Contributors +#### Developers [Wessel Tip](https://github.com/Wessel) - Development
    + [Isaac (Eartharoid)](https://github.com/eartharoid) - QA, Development, Photographer
    ### Translators @@ -138,9 +143,13 @@ Please see our [roadmap](https://github.com/mue/mue/projects) [Pronin Egor](https://github.com/MrZillaGold) - Russian -### Other +[Vicente](https://github.com/Vicente015) - Spanish + +### Resources [Pexels](https://pexels.com) - Stock photos used for offline mode [Opera Forum](https://forums.opera.com/topic/25046/how-to-disable-completely-the-speed-dial/14) - Portions of code to add Opera support -And many thanks to [Highholding](https://discord.bio/p/highholding), [Noa Shapira](#), [Roee Lupo](https://github.com/RoeeLupo), [Jeroen](#), [Glasvegas](https://twitter.com/_glasvegas), [Anders](https://github.com/FuryingFox), [Oded Shapira](https://twitter.com/dondishdev), Jacob Tyrrell and [Nikka Lai](#) for letting us use their wonderful photographs +Many thanks to [Highholding](https://discord.bio/p/highholding), [Noa Shapira](#), [Roee Lupo](https://github.com/RoeeLupo), [Jeroen](#), [Glasvegas](https://twitter.com/_glasvegas), [Anders](https://github.com/FuryingFox), [Oded Shapira](https://twitter.com/dondishdev), Jacob Tyrrell and [Nikka Lai](#) for letting us use their wonderful photographs. + +And finally, a big thank you to all the [contributors](https://github.com/mue/mue/graphs/contributors)! \ No newline at end of file diff --git a/package.json b/package.json index 9a0440dd..b13de57f 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "David \"ohlookitsderpy\" Ralph (https://derpyenterprises.org)", "Alex \"TurboMarshmello\" Sparkes (https://github.com/alexsparkes)" ], - "description": "Fast, open and free-to-use new tab page for most modern browsers.", + "description": "Fast, open and free-to-use new tab page for modern browsers.", "repository": { "url": "github:mue/mue" }, diff --git a/src/components/modals/settings/Dropdown.jsx b/src/components/modals/settings/Dropdown.jsx index 6923da32..ea65294d 100644 --- a/src/components/modals/settings/Dropdown.jsx +++ b/src/components/modals/settings/Dropdown.jsx @@ -2,19 +2,19 @@ import React from 'react'; export default class Dropdown extends React.PureComponent { getLabel() { - return this.props.label ? : null; + return this.props.label ? : null; } render() { return ( - <> + {this.getLabel()}
    - +     ); } } \ No newline at end of file diff --git a/src/components/modals/settings/sections/LanguageSettings.jsx b/src/components/modals/settings/sections/LanguageSettings.jsx index 2c9717cf..0bc2ec7c 100644 --- a/src/components/modals/settings/sections/LanguageSettings.jsx +++ b/src/components/modals/settings/sections/LanguageSettings.jsx @@ -12,8 +12,9 @@ export default class LanguageSettings extends React.PureComponent { onChange={() => localStorage.setItem('language', document.getElementById('language').value)} > - + + diff --git a/src/modules/settingsFunctions.js b/src/modules/settingsFunctions.js index dd3eddc6..6dfabf51 100644 --- a/src/modules/settingsFunctions.js +++ b/src/modules/settingsFunctions.js @@ -78,7 +78,7 @@ export default class SettingsFunctions { if (supportsWebP) localStorage.setItem('supportswebp', 'true'); // Languages - const languages = ['nl', 'no', 'fr', 'ru']; + const languages = ['nl', 'no', 'fr', 'ru', 'es']; const browserLanguage = (navigator.languages && navigator.languages[0]) || navigator.language; if (languages.includes(browserLanguage)) { localStorage.setItem('language', browserLanguage);