From e09c04b57bfedf8b1fd99034e2c60aeba592c65a Mon Sep 17 00:00:00 2001 From: ssssobek Date: Sun, 10 Mar 2024 20:14:48 +0100 Subject: [PATCH 01/12] Add blurred backgroud for subtitles --- src/assets/locales/en.json | 1 + src/assets/locales/pl.json | 1 + .../player/atoms/settings/CaptionSettingsView.tsx | 12 ++++++++++++ src/components/player/base/SubtitleView.tsx | 4 ++++ src/pages/parts/settings/CaptionsPart.tsx | 13 +++++++++++++ src/stores/subtitles/index.ts | 8 ++++++++ 6 files changed, 39 insertions(+) diff --git a/src/assets/locales/en.json b/src/assets/locales/en.json index 55922380..dc4d6ed1 100644 --- a/src/assets/locales/en.json +++ b/src/assets/locales/en.json @@ -533,6 +533,7 @@ }, "subtitles": { "backgroundLabel": "Background opacity", + "backgroundBlurLabel": "Background blur", "colorLabel": "Color", "previewQuote": "I must not fear. Fear is the mind-killer.", "textSizeLabel": "Text size", diff --git a/src/assets/locales/pl.json b/src/assets/locales/pl.json index a653e4f9..843e2201 100644 --- a/src/assets/locales/pl.json +++ b/src/assets/locales/pl.json @@ -525,6 +525,7 @@ }, "subtitles": { "backgroundLabel": "Krycie tła", + "backgroundBlurLabel": "Rozmycie tła", "colorLabel": "Kolor", "previewQuote": "Nie wolno mi się bać. Strach zabija myślenie.", "textSizeLabel": "Rozmiar czcionki", diff --git a/src/components/player/atoms/settings/CaptionSettingsView.tsx b/src/components/player/atoms/settings/CaptionSettingsView.tsx index 5515946d..936e693d 100644 --- a/src/components/player/atoms/settings/CaptionSettingsView.tsx +++ b/src/components/player/atoms/settings/CaptionSettingsView.tsx @@ -262,6 +262,18 @@ export function CaptionSettingsView({ id }: { id: string }) { value={styling.backgroundOpacity * 100} textTransformer={(s) => `${s}%`} /> + + updateStyling({ + backgroundBlur: Math.round(v / 4) * 4, + }) + } + value={styling.backgroundBlur} + textTransformer={(s) => `${s}px`} + /> `${s}%`} /> + + props.setStyling({ + ...props.styling, + backgroundBlur: Math.round(v / 4) * 4, + }) + } + value={props.styling.backgroundBlur} + textTransformer={(s) => `${s}px`} + /> { @@ -62,6 +68,8 @@ export const useSubtitleStore = create( set((s) => { if (newStyling.backgroundOpacity !== undefined) s.styling.backgroundOpacity = newStyling.backgroundOpacity; + if (newStyling.backgroundBlur !== undefined) + s.styling.backgroundBlur = newStyling.backgroundBlur; if (newStyling.color !== undefined) s.styling.color = newStyling.color.toLowerCase(); if (newStyling.size !== undefined) From ca180ab9ea171e49e903d9e97f72f52451a245cf Mon Sep 17 00:00:00 2001 From: ssssobek Date: Sun, 10 Mar 2024 23:10:25 +0100 Subject: [PATCH 02/12] Go back to using percentages instead of pixels --- .../player/atoms/settings/CaptionSettingsView.tsx | 12 ++++-------- src/components/player/base/SubtitleView.tsx | 2 +- src/pages/parts/settings/CaptionsPart.tsx | 11 ++++------- src/stores/subtitles/index.ts | 2 +- 4 files changed, 10 insertions(+), 17 deletions(-) diff --git a/src/components/player/atoms/settings/CaptionSettingsView.tsx b/src/components/player/atoms/settings/CaptionSettingsView.tsx index 936e693d..2e78ed7a 100644 --- a/src/components/player/atoms/settings/CaptionSettingsView.tsx +++ b/src/components/player/atoms/settings/CaptionSettingsView.tsx @@ -264,15 +264,11 @@ export function CaptionSettingsView({ id }: { id: string }) { /> - updateStyling({ - backgroundBlur: Math.round(v / 4) * 4, - }) - } - value={styling.backgroundBlur} - textTransformer={(s) => `${s}px`} + onChange={(v) => updateStyling({ backgroundBlur: v / 100 })} + value={styling.backgroundBlur * 100} + textTransformer={(s) => `${s}%`} /> diff --git a/src/pages/parts/settings/CaptionsPart.tsx b/src/pages/parts/settings/CaptionsPart.tsx index 3a16dd25..a6f8ddb5 100644 --- a/src/pages/parts/settings/CaptionsPart.tsx +++ b/src/pages/parts/settings/CaptionsPart.tsx @@ -94,16 +94,13 @@ export function CaptionsPart(props: { /> - props.setStyling({ - ...props.styling, - backgroundBlur: Math.round(v / 4) * 4, - }) + props.setStyling({ ...props.styling, backgroundBlur: v / 100 }) } - value={props.styling.backgroundBlur} - textTransformer={(s) => `${s}px`} + value={props.styling.backgroundBlur * 100} + textTransformer={(s) => `${s}%`} /> Date: Sun, 10 Mar 2024 23:56:06 +0100 Subject: [PATCH 03/12] Set the default background blur to 50% --- src/stores/subtitles/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stores/subtitles/index.ts b/src/stores/subtitles/index.ts index b1b535d1..31e59836 100644 --- a/src/stores/subtitles/index.ts +++ b/src/stores/subtitles/index.ts @@ -56,7 +56,7 @@ export const useSubtitleStore = create( color: "#ffffff", backgroundOpacity: 0.5, size: 1, - backgroundBlur: 0, + backgroundBlur: 0.5, }, resetSubtitleSpecificSettings() { set((s) => { From 9cb614701713550c47c9a97a7bfd154bad85ed5d Mon Sep 17 00:00:00 2001 From: William Oldham Date: Sun, 10 Mar 2024 23:09:09 +0000 Subject: [PATCH 04/12] Bump version to 4.6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fe2cc3d0..40537337 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "movie-web", - "version": "4.5.1", + "version": "4.6.0", "private": true, "homepage": "https://github.com/movie-web/movie-web", "scripts": { From 27297227e65a8bb2b03f93f937320188d8e1d588 Mon Sep 17 00:00:00 2001 From: Juled Zaganjori Date: Sun, 3 Mar 2024 21:13:03 +0000 Subject: [PATCH 05/12] Added translation using Weblate (Albanian) Author: Juled Zaganjori --- src/assets/locales/sq-AL.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/assets/locales/sq-AL.json diff --git a/src/assets/locales/sq-AL.json b/src/assets/locales/sq-AL.json new file mode 100644 index 00000000..0967ef42 --- /dev/null +++ b/src/assets/locales/sq-AL.json @@ -0,0 +1 @@ +{} From 90e1d3c36929ae76012b98c349b0aa4dba16fb4b Mon Sep 17 00:00:00 2001 From: chaos Date: Sun, 3 Mar 2024 22:46:02 +0000 Subject: [PATCH 06/12] Translated using Weblate (Estonian) Currently translated at 100.0% (327 of 327 strings) Translation: movie-web/website Translate-URL: https://weblate.476328473.xyz/projects/movie-web/website/et/ Author: chaos --- src/assets/locales/et.json | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/assets/locales/et.json b/src/assets/locales/et.json index 8819ce15..d609a173 100644 --- a/src/assets/locales/et.json +++ b/src/assets/locales/et.json @@ -57,6 +57,8 @@ }, "host": "Ühendate <0>{{hostname}} - enne konto tegemist kinnitage, et usaldate seda", "no": "Tagasi", + "noHost": "Server ei ole konfigureeritud, seega ei saa kontot luua", + "noHostTitle": "Server ei ole konfigureeritud!", "title": "Kas usaldate seda serverit?", "yes": "Usaldan seda serverit" }, @@ -118,7 +120,12 @@ "noResults": "Me ei leidnud midagi!", "placeholder": { "default": "Mida tahate vaadata?", - "extra": [] + "extra": [ + "Mida soovite uurida?", + "Mis on teie nimekirjas?", + "Milline on teie lemmikfilm?", + "Milline on teie lemmiksari?" + ] }, "sectionTitle": "Otsingutulemused" }, @@ -131,11 +138,15 @@ }, "morning": { "default": "Mida te soovite täna hommikul vaadata?", - "extra": ["Ma kuulsin, et Before Sunrise on hea"] + "extra": [ + "Ma kuulsin, et Before Sunrise on hea" + ] }, "night": { "default": "Mida te soovite täna õhtul vaadata?", - "extra": ["Väsinud? Olen kuulnud, et The Exorcist on hea."] + "extra": [ + "Väsinud? Olen kuulnud, et The Exorcist on hea." + ] } } }, @@ -241,6 +252,7 @@ }, "menus": { "downloads": { + "copyHlsPlaylist": "Kopeeri HLS esitusloendi link", "disclaimer": "Allalaadimine toimub otse teenusepakkujalt. movie-web ei saa kontrollida, kuidas allalaadimine toimub.", "downloadSubtitle": "Laadige alla praegune subtiiter", "downloadVideo": "Lae alla video", From 7ffb904f9e75a6a3d103da41ac76fa5aba18d117 Mon Sep 17 00:00:00 2001 From: aryiu Date: Mon, 4 Mar 2024 20:08:40 +0000 Subject: [PATCH 07/12] Translated using Weblate (Valencian) Currently translated at 100.0% (327 of 327 strings) Translation: movie-web/website Translate-URL: https://weblate.476328473.xyz/projects/movie-web/website/ca@valencia/ Author: aryiu --- src/assets/locales/ca@valencia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/locales/ca@valencia.json b/src/assets/locales/ca@valencia.json index 8f883342..078c7a10 100644 --- a/src/assets/locales/ca@valencia.json +++ b/src/assets/locales/ca@valencia.json @@ -437,7 +437,7 @@ "confirmButton": "Elimina el compte", "confirmDescription": "Segur que voleu eliminar el compte? Es perdran totes les dades!", "confirmTitle": "Segur?", - "text": "esta acció és irreversible. Totes les dades s'eliminaran i no es podrà recuperar res.", + "text": "Esta acció és irreversible. Totes les dades s'eliminaran i no es podrà recuperar res.", "title": "Elimina el compte" }, "title": "Accions" From 5754215725e8263f104c27171dcf9d9ebf88a07a Mon Sep 17 00:00:00 2001 From: Matias Bubello Date: Tue, 5 Mar 2024 23:16:17 +0000 Subject: [PATCH 08/12] Translated using Weblate (Spanish) Currently translated at 100.0% (327 of 327 strings) Translation: movie-web/website Translate-URL: https://weblate.476328473.xyz/projects/movie-web/website/es/ Author: Matias Bubello --- src/assets/locales/es.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/assets/locales/es.json b/src/assets/locales/es.json index d664c598..ecc105d0 100644 --- a/src/assets/locales/es.json +++ b/src/assets/locales/es.json @@ -12,7 +12,7 @@ }, "q3": { "body": "Nuestros resultados de búsqueda están alimentados por The Movie Database (TMDB) y se muestran independientemente de si nuestras fuentes realmente tienen el contenido.", - "title": "Los resultados de búsqueda muestran la serie o película, ¿por qué no puedo reproducirla?" + "title": "Los resultados de búsqueda muestran la serie o película, ¿Por qué no puedo reproducirla?" }, "title": "Acerca de movie-web" }, @@ -181,7 +181,7 @@ "cancel": "Cancelar", "confirm": "Usar configuración por defecto", "description": "La configuración predeterminada no tiene las mejores transmisiones y puede ser insoportablemente lenta.", - "title": "Estás seguro?" + "title": "¿Estás seguro?" }, "extension": { "back": "Volver atrás", @@ -399,7 +399,7 @@ "shortRemaining": "-{{timeLeft}}" }, "turnstile": { - "description": "Por favor, confirma que eres humano completando el Captcha. Esto es para mantener movie-web seguro!", + "description": "Por favor, confirma que eres humano completando el Captcha. ¡Esto es para mantener movie-web seguro!", "error": "Ha habido un error al verificar tu humanidad. Por favor, prueba de nuevo.", "title": "Necesitamos verificar que eres humano.", "verifyingHumanity": "Verificando tu hunanidad…" @@ -494,7 +494,7 @@ "redoSetup": "Rehacer configuración", "successStatus": { "description": "Todo lo necesario está en su sitio para que empieces a ver tu contenido favorito.", - "title": "Todo está configurado!" + "title": "¡Todo está configurado!" }, "unsetStatus": { "description": "Haga clic en el botón a la derecha para iniciar el proceso de configuración.", From dd0b9f60c9e21adf0f9f2f65b67c9b6043ccee2c Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 6 Mar 2024 12:44:33 +0000 Subject: [PATCH 09/12] Translated using Weblate (Russian) Currently translated at 100.0% (327 of 327 strings) Translation: movie-web/website Translate-URL: https://weblate.476328473.xyz/projects/movie-web/website/ru/ Author: Alex --- src/assets/locales/ru.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/assets/locales/ru.json b/src/assets/locales/ru.json index 69eb43be..d332d111 100644 --- a/src/assets/locales/ru.json +++ b/src/assets/locales/ru.json @@ -57,6 +57,8 @@ }, "host": "Вы подключаетесь к <0>{{hostname}} - пожалуйста, подтвердите, что вы доверяете ему, прежде чем создавать учётную запись", "no": "Вернуться назад", + "noHost": "Сервер не был настроен, поэтому вы не можете создать учётную запись", + "noHostTitle": "Сервер не настроен!", "title": "Вы доверяете этому серверу?", "yes": "Я доверяю этому серверу" }, @@ -118,7 +120,12 @@ "noResults": "Мы ничего не нашли!", "placeholder": { "default": "Что вы хотите посмотреть?", - "extra": [] + "extra": [ + "Что вы хотите исследовать?", + "Что в вашем списке?", + "Какой ваш любимый фильм?", + "Какой ваш любимый сериал?" + ] }, "sectionTitle": "Результаты поиска" }, @@ -131,7 +138,9 @@ }, "morning": { "default": "Что бы вы хотели посмотреть этим утром?", - "extra": ["Слышали, что «Перед рассветом» – отличный фильм"] + "extra": [ + "Слышали, что «Перед рассветом» – отличный фильм" + ] }, "night": { "default": "Что бы вы хотели посмотреть этим вечером?", From 3cab6ab3c3d7a624ed8aa4d025f63d4fb820ac47 Mon Sep 17 00:00:00 2001 From: Jimin Date: Fri, 8 Mar 2024 02:02:16 +0000 Subject: [PATCH 10/12] Translated using Weblate (Korean) Currently translated at 99.6% (326 of 327 strings) Translation: movie-web/website Translate-URL: https://weblate.476328473.xyz/projects/movie-web/website/ko/ Author: Jimin --- src/assets/locales/ko.json | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/assets/locales/ko.json b/src/assets/locales/ko.json index f4b48fb1..16d7fb9a 100644 --- a/src/assets/locales/ko.json +++ b/src/assets/locales/ko.json @@ -57,6 +57,8 @@ }, "host": "<0>{{hostname}}에 연결 중입니다 - 계정을 만들기 전에 신뢰하는지 확인해 주세요", "no": "뒤로 가기", + "noHost": "서버가 구성되어 있지 않기 때문에 계정을 만들 수 없습니다", + "noHostTitle": "서버가 구성되지 않았습니다!", "title": "이 서버를 신뢰하십니까?", "yes": "네, 신뢰합니다" }, @@ -118,7 +120,12 @@ "noResults": "검색결과가 없습니다!", "placeholder": { "default": "무엇을 보고 싶으신가요?", - "extra": [] + "extra": [ + "무엇을 탐험하고 싶으신가요?", + null, + "당신이 가장 좋아하는 영화는?", + "당신이 가장 좋아하는 시리즈는?" + ] }, "sectionTitle": "검색 결과" }, @@ -131,11 +138,15 @@ }, "morning": { "default": "오늘 아침에 무엇을 보고 싶으신가요?", - "extra": ["Before Sunrise가 좋다고 들었어요"] + "extra": [ + "Before Sunrise가 좋다고 들었어요" + ] }, "night": { "default": "오늘 밤에 무엇을 보고 싶으신가요?", - "extra": ["피곤하신가요? The Exorcist가 좋다고 들었어요."] + "extra": [ + "피곤하신가요? The Exorcist가 좋다고 들었어요." + ] } } }, @@ -241,6 +252,7 @@ }, "menus": { "downloads": { + "copyHlsPlaylist": "HLS 플레이리스트 링크 복사하기", "disclaimer": "다운로드는 제공업체에서 직접 가져옵니다. movie-web은 다운로드 제공 방식을 통제할 수 없습니다.", "downloadSubtitle": "현재 자막 다운로드", "downloadVideo": "영상 다운로드", From 57a747099e01b540a69794cc22496d8c2ee1ef86 Mon Sep 17 00:00:00 2001 From: chaos Date: Sun, 10 Mar 2024 23:08:01 +0000 Subject: [PATCH 11/12] Translated using Weblate (Estonian) Currently translated at 100.0% (328 of 328 strings) Translation: movie-web/website Translate-URL: https://weblate.476328473.xyz/projects/movie-web/website/et/ Author: chaos --- src/assets/locales/et.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/assets/locales/et.json b/src/assets/locales/et.json index d609a173..50d4f8b4 100644 --- a/src/assets/locales/et.json +++ b/src/assets/locales/et.json @@ -536,6 +536,7 @@ } }, "subtitles": { + "backgroundBlurLabel": "Tausta hägusus", "backgroundLabel": "Tausta läbipaistmatus", "colorLabel": "Värv", "previewQuote": "Ma ei tohi karta. Hirm on meelemõrvar.", From cfaf2130e4b9cbf9f321bc5e2c24187b6038f81e Mon Sep 17 00:00:00 2001 From: admin Date: Sun, 10 Mar 2024 23:14:11 +0000 Subject: [PATCH 12/12] Deleted translation using Weblate (Albanian) Author: admin --- src/assets/locales/sq-AL.json | 1 - 1 file changed, 1 deletion(-) delete mode 100644 src/assets/locales/sq-AL.json diff --git a/src/assets/locales/sq-AL.json b/src/assets/locales/sq-AL.json deleted file mode 100644 index 0967ef42..00000000 --- a/src/assets/locales/sq-AL.json +++ /dev/null @@ -1 +0,0 @@ -{}