From 35c9c85b86a200e6edb9cc6f95eaaec24bafcea6 Mon Sep 17 00:00:00 2001 From: qtchaos <72168435+qtchaos@users.noreply.github.com> Date: Mon, 11 Mar 2024 17:46:47 +0200 Subject: [PATCH 01/18] fix: increase maximum subtitle size, set background blur max to 100% and increase padding on the bottom of captions view --- src/components/player/atoms/settings/CaptionSettingsView.tsx | 2 +- src/stores/subtitles/index.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/player/atoms/settings/CaptionSettingsView.tsx b/src/components/player/atoms/settings/CaptionSettingsView.tsx index 2e78ed7a..2efe8eb9 100644 --- a/src/components/player/atoms/settings/CaptionSettingsView.tsx +++ b/src/components/player/atoms/settings/CaptionSettingsView.tsx @@ -231,7 +231,7 @@ export function CaptionSettingsView({ id }: { id: string }) { router.navigate("/captions")}> {t("player.menus.subtitles.settings.backlink")} - + Date: Mon, 11 Mar 2024 17:59:55 +0200 Subject: [PATCH 02/18] fix: add minimums & maximums for other settings --- src/stores/subtitles/index.ts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/stores/subtitles/index.ts b/src/stores/subtitles/index.ts index e7f0aa26..0d89763f 100644 --- a/src/stores/subtitles/index.ts +++ b/src/stores/subtitles/index.ts @@ -67,9 +67,15 @@ export const useSubtitleStore = create( updateStyling(newStyling) { set((s) => { if (newStyling.backgroundOpacity !== undefined) - s.styling.backgroundOpacity = newStyling.backgroundOpacity; + s.styling.backgroundOpacity = Math.min( + 1, + Math.max(0, newStyling.backgroundOpacity), + ); if (newStyling.backgroundBlur !== undefined) - s.styling.backgroundBlur = Math.min(1, newStyling.backgroundBlur); + s.styling.backgroundBlur = Math.min( + 1, + Math.max(0, newStyling.backgroundBlur), + ); if (newStyling.color !== undefined) s.styling.color = newStyling.color.toLowerCase(); if (newStyling.size !== undefined) From 64c0a6b7a867dfa8f4acc1bc9d07cf3bac8e74e8 Mon Sep 17 00:00:00 2001 From: William Oldham Date: Mon, 11 Mar 2024 18:46:09 +0000 Subject: [PATCH 03/18] Use deep merge on store to ensure settings are defaulted correctly --- package.json | 2 + pnpm-lock.yaml | 71 ++++++++++++++++++++--------------- src/stores/quality/index.ts | 2 + src/stores/subtitles/index.ts | 2 + 4 files changed, 47 insertions(+), 30 deletions(-) diff --git a/package.json b/package.json index 40537337..fcb2ce42 100644 --- a/package.json +++ b/package.json @@ -49,6 +49,7 @@ "immer": "^10.0.3", "jwt-decode": "^4.0.0", "lodash.isequal": "^4.5.0", + "lodash.merge": "^4.6.2", "million": "^2.6.4", "nanoid": "^5.0.4", "node-forge": "^1.3.1", @@ -79,6 +80,7 @@ "@types/dompurify": "^3.0.5", "@types/fscreen": "^1.0.4", "@types/lodash.isequal": "^4.5.8", + "@types/lodash.merge": "^4.6.9", "@types/lodash.throttle": "^4.1.9", "@types/node": "^20.10.5", "@types/pako": "^2.0.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ed583cf8..b0cdcb77 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -81,6 +81,9 @@ dependencies: lodash.isequal: specifier: ^4.5.0 version: 4.5.0 + lodash.merge: + specifier: ^4.6.2 + version: 4.6.2 million: specifier: ^2.6.4 version: 2.6.4 @@ -167,6 +170,9 @@ devDependencies: '@types/lodash.isequal': specifier: ^4.5.8 version: 4.5.8 + '@types/lodash.merge': + specifier: ^4.6.9 + version: 4.6.9 '@types/lodash.throttle': specifier: ^4.1.9 version: 4.1.9 @@ -268,7 +274,7 @@ devDependencies: version: 0.5.9(prettier@3.1.1) rollup-plugin-visualizer: specifier: ^5.11.0 - version: 5.11.0(@rollup/wasm-node@4.12.0) + version: 5.11.0(@rollup/wasm-node@4.12.1) tailwind-scrollbar: specifier: ^3.0.5 version: 3.0.5(tailwindcss@3.4.0) @@ -2062,7 +2068,7 @@ packages: engines: {node: '>=14.0.0'} dev: false - /@rollup/plugin-babel@5.3.1(@babel/core@7.23.6)(@rollup/wasm-node@4.12.0): + /@rollup/plugin-babel@5.3.1(@babel/core@7.23.6)(@rollup/wasm-node@4.12.1): resolution: {integrity: sha512-WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q==} engines: {node: '>= 10.0.0'} peerDependencies: @@ -2075,36 +2081,36 @@ packages: dependencies: '@babel/core': 7.23.6 '@babel/helper-module-imports': 7.22.15 - '@rollup/pluginutils': 3.1.0(@rollup/wasm-node@4.12.0) - rollup: /@rollup/wasm-node@4.12.0 + '@rollup/pluginutils': 3.1.0(@rollup/wasm-node@4.12.1) + rollup: /@rollup/wasm-node@4.12.1 dev: true - /@rollup/plugin-node-resolve@11.2.1(@rollup/wasm-node@4.12.0): + /@rollup/plugin-node-resolve@11.2.1(@rollup/wasm-node@4.12.1): resolution: {integrity: sha512-yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg==} engines: {node: '>= 10.0.0'} peerDependencies: rollup: npm:@rollup/wasm-node dependencies: - '@rollup/pluginutils': 3.1.0(@rollup/wasm-node@4.12.0) + '@rollup/pluginutils': 3.1.0(@rollup/wasm-node@4.12.1) '@types/resolve': 1.17.1 builtin-modules: 3.3.0 deepmerge: 4.3.1 is-module: 1.0.0 resolve: 1.22.4 - rollup: /@rollup/wasm-node@4.12.0 + rollup: /@rollup/wasm-node@4.12.1 dev: true - /@rollup/plugin-replace@2.4.2(@rollup/wasm-node@4.12.0): + /@rollup/plugin-replace@2.4.2(@rollup/wasm-node@4.12.1): resolution: {integrity: sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg==} peerDependencies: rollup: npm:@rollup/wasm-node dependencies: - '@rollup/pluginutils': 3.1.0(@rollup/wasm-node@4.12.0) + '@rollup/pluginutils': 3.1.0(@rollup/wasm-node@4.12.1) magic-string: 0.25.9 - rollup: /@rollup/wasm-node@4.12.0 + rollup: /@rollup/wasm-node@4.12.1 dev: true - /@rollup/pluginutils@3.1.0(@rollup/wasm-node@4.12.0): + /@rollup/pluginutils@3.1.0(@rollup/wasm-node@4.12.1): resolution: {integrity: sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==} engines: {node: '>= 8.0.0'} peerDependencies: @@ -2113,11 +2119,11 @@ packages: '@types/estree': 0.0.39 estree-walker: 1.0.1 picomatch: 2.3.1 - rollup: /@rollup/wasm-node@4.12.0 + rollup: /@rollup/wasm-node@4.12.1 dev: true - /@rollup/wasm-node@4.12.0: - resolution: {integrity: sha512-sqy3+YvV/uWX6bPZOR5PlEdH6xyMPXoelllRQ/uZ13tzy9f4pXZTbajnoWN8IHHXwTNKPiLzsePLiDEVmkxMNw==} + /@rollup/wasm-node@4.12.1: + resolution: {integrity: sha512-5j3BVQEccCzCb8fkl++IbDgAsnlsKBPz049C4C//j5s3pFKxKGlybl63QApdJKl1fNLr7HIwQEJcBImQtA3ZHg==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true dependencies: @@ -2262,17 +2268,23 @@ packages: /@types/lodash.isequal@4.5.8: resolution: {integrity: sha512-uput6pg4E/tj2LGxCZo9+y27JNyB2OZuuI/T5F+ylVDYuqICLG2/ktjxx0v6GvVntAf8TvEzeQLcV0ffRirXuA==} dependencies: - '@types/lodash': 4.14.197 + '@types/lodash': 4.14.202 + dev: true + + /@types/lodash.merge@4.6.9: + resolution: {integrity: sha512-23sHDPmzd59kUgWyKGiOMO2Qb9YtqRO/x4IhkgNUiPQ1+5MUVqi6bCZeq9nBJ17msjIMbEIO5u+XW4Kz6aGUhQ==} + dependencies: + '@types/lodash': 4.14.202 dev: true /@types/lodash.throttle@4.1.9: resolution: {integrity: sha512-PCPVfpfueguWZQB7pJQK890F2scYKoDUL3iM522AptHWn7d5NQmeS/LTEHIcLr5PaTzl3dK2Z0xSUHHTHwaL5g==} dependencies: - '@types/lodash': 4.14.197 + '@types/lodash': 4.14.202 dev: true - /@types/lodash@4.14.197: - resolution: {integrity: sha512-BMVOiWs0uNxHVlHBgzTIqJYmj+PgCo4euloGF+5m4okL3rEYzM2EEv78mw8zWSMM57dM7kVIgJ2QDvwHSoCI5g==} + /@types/lodash@4.14.202: + resolution: {integrity: sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ==} dev: true /@types/node-forge@1.3.10: @@ -5004,7 +5016,6 @@ packages: /lodash.merge@4.6.2: resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==} - dev: true /lodash.mergewith@4.6.2: resolution: {integrity: sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==} @@ -5101,7 +5112,7 @@ packages: '@babel/plugin-syntax-typescript': 7.23.3(@babel/core@7.23.6) '@babel/types': 7.23.6 kleur: 4.1.5 - rollup: /@rollup/wasm-node@4.12.0 + rollup: /@rollup/wasm-node@4.12.1 unplugin: 1.5.1 transitivePeerDependencies: - supports-color @@ -6029,7 +6040,7 @@ packages: glob: 7.2.3 dev: true - /rollup-plugin-terser@7.0.2(@rollup/wasm-node@4.12.0): + /rollup-plugin-terser@7.0.2(@rollup/wasm-node@4.12.1): resolution: {integrity: sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==} deprecated: This package has been deprecated and is no longer maintained. Please use @rollup/plugin-terser peerDependencies: @@ -6037,12 +6048,12 @@ packages: dependencies: '@babel/code-frame': 7.23.5 jest-worker: 26.6.2 - rollup: /@rollup/wasm-node@4.12.0 + rollup: /@rollup/wasm-node@4.12.1 serialize-javascript: 4.0.0 terser: 5.19.3 dev: true - /rollup-plugin-visualizer@5.11.0(@rollup/wasm-node@4.12.0): + /rollup-plugin-visualizer@5.11.0(@rollup/wasm-node@4.12.1): resolution: {integrity: sha512-exM0Ms2SN3AgTzMeW7y46neZQcyLY7eKwWAop1ZoRTCZwyrIRdMMJ6JjToAJbML77X/9N8ZEpmXG4Z/Clb9k8g==} engines: {node: '>=14'} hasBin: true @@ -6054,7 +6065,7 @@ packages: dependencies: open: 8.4.2 picomatch: 2.3.1 - rollup: /@rollup/wasm-node@4.12.0 + rollup: /@rollup/wasm-node@4.12.1 source-map: 0.7.4 yargs: 17.7.2 dev: true @@ -7040,7 +7051,7 @@ packages: '@types/node': 20.10.5 esbuild: 0.19.10 postcss: 8.4.32 - rollup: /@rollup/wasm-node@4.12.0 + rollup: /@rollup/wasm-node@4.12.1 optionalDependencies: fsevents: 2.3.3 dev: true @@ -7302,9 +7313,9 @@ packages: '@babel/core': 7.23.6 '@babel/preset-env': 7.23.6(@babel/core@7.23.6) '@babel/runtime': 7.23.6 - '@rollup/plugin-babel': 5.3.1(@babel/core@7.23.6)(@rollup/wasm-node@4.12.0) - '@rollup/plugin-node-resolve': 11.2.1(@rollup/wasm-node@4.12.0) - '@rollup/plugin-replace': 2.4.2(@rollup/wasm-node@4.12.0) + '@rollup/plugin-babel': 5.3.1(@babel/core@7.23.6)(@rollup/wasm-node@4.12.1) + '@rollup/plugin-node-resolve': 11.2.1(@rollup/wasm-node@4.12.1) + '@rollup/plugin-replace': 2.4.2(@rollup/wasm-node@4.12.1) '@surma/rollup-plugin-off-main-thread': 2.2.3 ajv: 8.12.0 common-tags: 1.8.2 @@ -7313,8 +7324,8 @@ packages: glob: 7.2.3 lodash: 4.17.21 pretty-bytes: 5.6.0 - rollup: /@rollup/wasm-node@4.12.0 - rollup-plugin-terser: 7.0.2(@rollup/wasm-node@4.12.0) + rollup: /@rollup/wasm-node@4.12.1 + rollup-plugin-terser: 7.0.2(@rollup/wasm-node@4.12.1) source-map: 0.8.0-beta.0 stringify-object: 3.3.0 strip-comments: 2.0.1 diff --git a/src/stores/quality/index.ts b/src/stores/quality/index.ts index 52a99f5a..6ec834a1 100644 --- a/src/stores/quality/index.ts +++ b/src/stores/quality/index.ts @@ -1,3 +1,4 @@ +import merge from "lodash.merge"; import { create } from "zustand"; import { persist } from "zustand/middleware"; import { immer } from "zustand/middleware/immer"; @@ -33,6 +34,7 @@ export const useQualityStore = create( })), { name: "__MW::quality", + merge: (persisted, current) => merge({}, current, persisted), }, ), ); diff --git a/src/stores/subtitles/index.ts b/src/stores/subtitles/index.ts index 0d89763f..90a3fd8c 100644 --- a/src/stores/subtitles/index.ts +++ b/src/stores/subtitles/index.ts @@ -1,3 +1,4 @@ +import merge from "lodash.merge"; import { create } from "zustand"; import { persist } from "zustand/middleware"; import { immer } from "zustand/middleware/immer"; @@ -113,6 +114,7 @@ export const useSubtitleStore = create( })), { name: "__MW::subtitles", + merge: (persisted, current) => merge({}, current, persisted), }, ), ); From d33faf370f49c8ca7e95e4032097b61f4a28f9e8 Mon Sep 17 00:00:00 2001 From: William Oldham Date: Mon, 11 Mar 2024 18:48:52 +0000 Subject: [PATCH 04/18] Bump padding to pb-5 to match top of card --- src/components/player/atoms/settings/CaptionSettingsView.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/player/atoms/settings/CaptionSettingsView.tsx b/src/components/player/atoms/settings/CaptionSettingsView.tsx index 2efe8eb9..d6b39fd5 100644 --- a/src/components/player/atoms/settings/CaptionSettingsView.tsx +++ b/src/components/player/atoms/settings/CaptionSettingsView.tsx @@ -231,7 +231,7 @@ export function CaptionSettingsView({ id }: { id: string }) { router.navigate("/captions")}> {t("player.menus.subtitles.settings.backlink")} - + Date: Mon, 11 Mar 2024 18:55:27 +0000 Subject: [PATCH 05/18] Bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fcb2ce42..becaa2e7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "movie-web", - "version": "4.6.0", + "version": "4.6.1", "private": true, "homepage": "https://github.com/movie-web/movie-web", "scripts": { From 5d25977ba86fe028063185c62f323494be521310 Mon Sep 17 00:00:00 2001 From: Raymond Nee Date: Mon, 11 Mar 2024 14:09:34 +0000 Subject: [PATCH 06/18] Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (328 of 328 strings) Translation: movie-web/website Translate-URL: https://weblate.476328473.xyz/projects/movie-web/website/zh_Hans/ Author: Raymond Nee --- src/assets/locales/zh.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/assets/locales/zh.json b/src/assets/locales/zh.json index 248da095..d7b66e1a 100644 --- a/src/assets/locales/zh.json +++ b/src/assets/locales/zh.json @@ -536,6 +536,7 @@ } }, "subtitles": { + "backgroundBlurLabel": "背景模糊", "backgroundLabel": "背景不透明度", "colorLabel": "颜色", "previewQuote": "我不能害怕。恐惧是心灵的杀手。", From 8fd409fa1f0fbf69a7ea49424188bf7ce28cc8f6 Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 10 Mar 2024 23:55:30 +0000 Subject: [PATCH 07/18] Translated using Weblate (Russian) Currently translated at 100.0% (328 of 328 strings) Translation: movie-web/website Translate-URL: https://weblate.476328473.xyz/projects/movie-web/website/ru/ Author: Alex --- src/assets/locales/ru.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/assets/locales/ru.json b/src/assets/locales/ru.json index d332d111..03186f65 100644 --- a/src/assets/locales/ru.json +++ b/src/assets/locales/ru.json @@ -536,6 +536,7 @@ } }, "subtitles": { + "backgroundBlurLabel": "Размытие фона", "backgroundLabel": "Прозрачность фона", "colorLabel": "Цвет", "previewQuote": "Я не должен бояться. Страх убивает разум.", From 11df7450b072150b839629c4daa3efa1771f2487 Mon Sep 17 00:00:00 2001 From: Alja Slenc Date: Mon, 11 Mar 2024 17:00:23 +0000 Subject: [PATCH 08/18] Translated using Weblate (Slovenian) Currently translated at 100.0% (328 of 328 strings) Translation: movie-web/website Translate-URL: https://weblate.476328473.xyz/projects/movie-web/website/sl/ Author: Alja Slenc --- src/assets/locales/sl.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/assets/locales/sl.json b/src/assets/locales/sl.json index 4b048f45..958b2ba7 100644 --- a/src/assets/locales/sl.json +++ b/src/assets/locales/sl.json @@ -536,6 +536,7 @@ } }, "subtitles": { + "backgroundBlurLabel": "Zameglitev ozadja", "backgroundLabel": "Motnost ozadja", "colorLabel": "Barva", "previewQuote": "Ne smem se bati. Strah je ubijalec misli.", From c928a8093dbebe6738b9fb95f569ea5273f07f57 Mon Sep 17 00:00:00 2001 From: Ninguart Date: Mon, 11 Mar 2024 19:00:06 +0000 Subject: [PATCH 09/18] Translated using Weblate (Czech) Currently translated at 98.4% (323 of 328 strings) Translation: movie-web/website Translate-URL: https://weblate.476328473.xyz/projects/movie-web/website/cs/ Author: Ninguart --- src/assets/locales/cs.json | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/src/assets/locales/cs.json b/src/assets/locales/cs.json index 796d3fd9..97802c0f 100644 --- a/src/assets/locales/cs.json +++ b/src/assets/locales/cs.json @@ -57,6 +57,8 @@ }, "host": "Připojujete se k <0>{{hostname}} - potvrďte, že mu věříte před vytvořením účtu", "no": "Zpět", + "noHost": "Server nebyl nakonfigurován, tudíž si nemůžete vytvořit účet", + "noHostTitle": "Server není nakonfigurován!", "title": "Věříte tomuto serveru?", "yes": "Věřím tomuto serveru" }, @@ -118,22 +120,33 @@ "noResults": "Nemohli jsme nic najít!", "placeholder": { "default": "Co si přejete sledovat?", - "extra": [] + "extra": [ + "Co chcete objevit?", + null, + "Jaký je váš oblíbený film?", + "Jaký je tvůj oblíbený seriál?" + ] }, "sectionTitle": "Výsledky vyhledávání" }, "titles": { "day": { "default": "Na co byste se chtěli dnes odpoledne dívat?", - "extra": ["Chceš zažít dobrodružství? Jurský Park je pro tebe."] + "extra": [ + "Chceš zažít dobrodružství? Jurský Park je pro tebe." + ] }, "morning": { "default": "Na co byste se chtěli dnes ráno dívat?", - "extra": ["Slyšel jsem, že Před úsvitem je super."] + "extra": [ + "Slyšel jsem, že Před úsvitem je super." + ] }, "night": { "default": "Na co byste se chtěli dnes večer dívat?", - "extra": ["Unaven? Slyšel jsem, že Vymítač ďábla je super."] + "extra": [ + "Unaven? Slyšel jsem, že Vymítač ďábla je super." + ] } } }, @@ -173,9 +186,11 @@ "extension": { "back": "Zpět", "explainer": "Pomocí rozšíření prohlížeče můžete získat nejlepší streamy, které nabízíme. S pouhou instalací.", + "explainerIos": "Bohužel rozšíření není podporováno na iOS. Stiskněte Zpět pro výběr jiné možnosti.", "extensionHelp": "Pokud jste rozšíření nainstalovali, ale nebylo zjištěno. Otevřete rozšíření pomocí nabídky rozšíření ve vašem prohlížeči a postupujte podle pokynů na obrazovce.", "linkChrome": "Instalovat rozšíření pro Chrome", "linkFirefox": "Instalovat rozšíření pro Firefox", + "notDetectingAction": "Obnovit stránku", "status": { "disallowed": "Rozšíření není pro tuto stránku povoleno", "disallowedAction": "Povolit rozšíření", From 0aac4894174386444e5001e8bde5bfedec23c09e Mon Sep 17 00:00:00 2001 From: thehairy Date: Mon, 11 Mar 2024 19:07:27 +0000 Subject: [PATCH 10/18] Translated using Weblate (German) Currently translated at 100.0% (328 of 328 strings) Translation: movie-web/website Translate-URL: https://weblate.476328473.xyz/projects/movie-web/website/de/ Author: thehairy --- src/assets/locales/de.json | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/assets/locales/de.json b/src/assets/locales/de.json index 1d352faf..c052944a 100644 --- a/src/assets/locales/de.json +++ b/src/assets/locales/de.json @@ -118,7 +118,10 @@ "noResults": "Wir haben nichts gefunden!", "placeholder": { "default": "Was möchtest du schauen?", - "extra": [] + "extra": [ + "Was möchtest du entdecken?", + "Was ist auf deiner Merkliste?" + ] }, "sectionTitle": "Suchergebnisse" }, @@ -131,11 +134,15 @@ }, "morning": { "default": "Was würdest du diesen Morgen gerne schauen?", - "extra": ["Before Sunrise soll gut sein"] + "extra": [ + "Before Sunrise soll gut sein" + ] }, "night": { "default": "Was möchtest du diesen Abend gerne schauen?", - "extra": ["Müde? Ich hab gehört The Exorcist soll gut sein."] + "extra": [ + "Müde? Ich hab gehört The Exorcist soll gut sein." + ] } } }, @@ -524,6 +531,7 @@ } }, "subtitles": { + "backgroundBlurLabel": "Hintergrundunschärfe", "backgroundLabel": "Hintergrunddeckkraft", "colorLabel": "Farbe", "previewQuote": "Das Gras wächst nicht schneller, wenn man daran zieht.", From da2472ac5d4ee68edb5d86ffb2f81f9a3f6791e5 Mon Sep 17 00:00:00 2001 From: teaishealthy Date: Mon, 11 Mar 2024 19:05:29 +0000 Subject: [PATCH 11/18] Translated using Weblate (German) Currently translated at 100.0% (328 of 328 strings) Translation: movie-web/website Translate-URL: https://weblate.476328473.xyz/projects/movie-web/website/de/ Author: teaishealthy --- src/assets/locales/de.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/assets/locales/de.json b/src/assets/locales/de.json index c052944a..d6155652 100644 --- a/src/assets/locales/de.json +++ b/src/assets/locales/de.json @@ -57,6 +57,8 @@ }, "host": "Du verbindest dich mit <0>{{hostname}} - stelle sicher das du dem Server vertraust, bevor du ein Konto erstellst", "no": "Zurück", + "noHost": "Da der Server nicht eingerichtet wurde, kannst du keinen Account erstellen", + "noHostTitle": "Server nicht eingerichtet!", "title": "Vertraust du diesem Server?", "yes": "Ich vertraue diesem Server" }, @@ -120,7 +122,9 @@ "default": "Was möchtest du schauen?", "extra": [ "Was möchtest du entdecken?", - "Was ist auf deiner Merkliste?" + "Was ist auf deiner Merkliste?", + "Was ist dein Lieblingsfilm?", + "Was ist deine Lieblingsserie?" ] }, "sectionTitle": "Suchergebnisse" @@ -248,6 +252,7 @@ }, "menus": { "downloads": { + "copyHlsPlaylist": "HLS-Playlist Link kopieren", "disclaimer": "Videos werden direkt vom Provider heruntergeladen. movie-web hat keinen Einfluss darauf, wie Downloads bereitgestellt werden.", "downloadSubtitle": "Aktuelle Untertitel herunterladen", "downloadVideo": "Video herunterladen", From 83853a38142763545af75ae2046f50f25fc57b01 Mon Sep 17 00:00:00 2001 From: Origaming Date: Mon, 11 Mar 2024 19:05:16 +0000 Subject: [PATCH 12/18] Translated using Weblate (French) Currently translated at 100.0% (328 of 328 strings) Translation: movie-web/website Translate-URL: https://weblate.476328473.xyz/projects/movie-web/website/fr/ Author: Origaming --- src/assets/locales/fr.json | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/assets/locales/fr.json b/src/assets/locales/fr.json index b1e47761..0daba5a3 100644 --- a/src/assets/locales/fr.json +++ b/src/assets/locales/fr.json @@ -57,6 +57,8 @@ }, "host": "Vous êtes en train de vous connecter à <0>{{hostname}} - veuillez confirmer que vous lui faites confiance avant de créer un compte", "no": "Retour", + "noHost": "Le serveur n'a pas été configuré, vous ne pouvez donc pas créer de compte", + "noHostTitle": "Serveur non configuré !", "title": "Avez-vous confiance en ce serveur ?", "yes": "Je fais confiance à ce serveur" }, @@ -117,7 +119,13 @@ "loading": "Chargement...", "noResults": "Nous n'avons rien trouvé !", "placeholder": { - "default": "Que voulez-vous voir ?" + "default": "Que voulez-vous voir ?", + "extra": [ + "Que voulez-vous explorer ?", + "Que y a-t-il dans votre liste de lecture?", + "Quel est votre film préféré ?", + "Quelle est votre série préférée ?" + ] }, "sectionTitle": "Résultats de la recherche" }, @@ -528,6 +536,7 @@ } }, "subtitles": { + "backgroundBlurLabel": "Flou d'arrière-plan", "backgroundLabel": "Opacité du fond", "colorLabel": "Couleur", "previewQuote": "Plus l'obscurité est profonde, plus la lumière brille.", From cff06d7591b0415d38a2bcb68aef31347c0af9c1 Mon Sep 17 00:00:00 2001 From: Jamie Poznanski Date: Mon, 11 Mar 2024 19:00:29 +0000 Subject: [PATCH 13/18] Translated using Weblate (Italian) Currently translated at 100.0% (328 of 328 strings) Translation: movie-web/website Translate-URL: https://weblate.476328473.xyz/projects/movie-web/website/it/ Author: Jamie Poznanski --- src/assets/locales/it.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/assets/locales/it.json b/src/assets/locales/it.json index 603061d1..875b44d5 100644 --- a/src/assets/locales/it.json +++ b/src/assets/locales/it.json @@ -536,6 +536,7 @@ } }, "subtitles": { + "backgroundBlurLabel": "Sfocatura di sfondo", "backgroundLabel": "Opacità di sfondo", "colorLabel": "Colore", "previewQuote": "Cantami o Diva del pelide Achille l'ira funesta.", From ae90d3d87317f3a709b39c905a8ad3478dcbefbc Mon Sep 17 00:00:00 2001 From: blikje Date: Mon, 11 Mar 2024 19:00:59 +0000 Subject: [PATCH 14/18] Translated using Weblate (Dutch) Currently translated at 100.0% (328 of 328 strings) Translation: movie-web/website Translate-URL: https://weblate.476328473.xyz/projects/movie-web/website/nl/ Author: blikje --- src/assets/locales/nl.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/assets/locales/nl.json b/src/assets/locales/nl.json index d5ca62c6..14f0ced6 100644 --- a/src/assets/locales/nl.json +++ b/src/assets/locales/nl.json @@ -536,6 +536,7 @@ } }, "subtitles": { + "backgroundBlurLabel": "Achtergrondvervaging", "backgroundLabel": "Achtergrond dekking", "colorLabel": "Kleur", "previewQuote": "Ik mag niet bang zijn. Angst doodt de geest.", From 808191c42e883a4617d90f69b81a11600f13ad51 Mon Sep 17 00:00:00 2001 From: Denys Savin Date: Mon, 11 Mar 2024 19:04:21 +0000 Subject: [PATCH 15/18] Translated using Weblate (Ukrainian) Currently translated at 100.0% (328 of 328 strings) Translation: movie-web/website Translate-URL: https://weblate.476328473.xyz/projects/movie-web/website/uk/ Author: Denys Savin --- src/assets/locales/uk.json | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/assets/locales/uk.json b/src/assets/locales/uk.json index 5b568aa6..79e8e087 100644 --- a/src/assets/locales/uk.json +++ b/src/assets/locales/uk.json @@ -57,6 +57,8 @@ }, "host": "Ви під’єднуєтеся до <0>{{hostname}} – підтвердьте, що довіряєте йому, перш ніж створювати обліковий запис", "no": "Повернутися назад", + "noHost": "Сервер не був налаштований, тому ви не можете створити обліковий запис", + "noHostTitle": "Сервер не налаштований!", "title": "Чи довіряєте ви цьому серверу?", "yes": "Я довіряю цьому серверу" }, @@ -118,7 +120,12 @@ "noResults": "Ми не змогли знайти нічого!", "placeholder": { "default": "Що ви хочете подивитися?", - "extra": [] + "extra": [ + "Що ви бажаєте дослідити?", + "Що у вашому списку спостереження?", + "Який ваш улюблений фільм?", + "Який ваш улюблений серіал?" + ] }, "sectionTitle": "Результати пошуку" }, @@ -131,11 +138,15 @@ }, "morning": { "default": "Що б ви хотіли подивитися сьогодні вранці?", - "extra": ["Я чув, що \"Перед сходом сонця\" гарний"] + "extra": [ + "Я чув, що \"Перед сходом сонця\" гарний" + ] }, "night": { "default": "Що б ви хотіли подивитися сьогодні ввечері?", - "extra": ["Втомився? Я чув, що \"Екзорцист\" хороший."] + "extra": [ + "Втомився? Я чув, що \"Екзорцист\" хороший." + ] } } }, @@ -241,6 +252,7 @@ }, "menus": { "downloads": { + "copyHlsPlaylist": "Копіювати посилання на плейлист HLS", "disclaimer": "Завантаження беруться безпосередньо від провайдера. У movie-web немає контролю над тим, як надаються завантаження.", "downloadSubtitle": "Завантажити поточні субтитри", "downloadVideo": "Завантажити відео", @@ -524,6 +536,7 @@ } }, "subtitles": { + "backgroundBlurLabel": "Розмиття фону", "backgroundLabel": "Прозорість фону", "colorLabel": "Колір", "previewQuote": "Я не повинен боятися. Страх вбиває розум.", From 85ddf7680fa3eba510bea4a99859edaf866d4794 Mon Sep 17 00:00:00 2001 From: Mehdi Date: Mon, 11 Mar 2024 19:01:31 +0000 Subject: [PATCH 16/18] Translated using Weblate (Persian) Currently translated at 100.0% (328 of 328 strings) Translation: movie-web/website Translate-URL: https://weblate.476328473.xyz/projects/movie-web/website/fa/ Author: Mehdi --- src/assets/locales/fa.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/assets/locales/fa.json b/src/assets/locales/fa.json index a2c31320..26f59428 100644 --- a/src/assets/locales/fa.json +++ b/src/assets/locales/fa.json @@ -536,6 +536,7 @@ } }, "subtitles": { + "backgroundBlurLabel": "تاری پس زمینه", "backgroundLabel": "شفافیت پس‌زمینه", "colorLabel": "رنگ", "previewQuote": "نباید بترسم، ترس قاتل ذهن است.", From fc76a84bc8084194ccb41f76783fd2805b5dfbe5 Mon Sep 17 00:00:00 2001 From: William Oldham Date: Mon, 11 Mar 2024 22:41:56 +0000 Subject: [PATCH 17/18] Set default extension links --- src/setup/config.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/setup/config.ts b/src/setup/config.ts index 26eb814e..98fad29e 100644 --- a/src/setup/config.ts +++ b/src/setup/config.ts @@ -94,9 +94,11 @@ export function conf(): RuntimeConfig { DMCA_EMAIL: getKey("DMCA_EMAIL"), ONBOARDING_CHROME_EXTENSION_INSTALL_LINK: getKey( "ONBOARDING_CHROME_EXTENSION_INSTALL_LINK", + "https://chromewebstore.google.com/detail/movie-web-extension/hoffoikpiofojilgpofjhnkkamfnnhmm", ), ONBOARDING_FIREFOX_EXTENSION_INSTALL_LINK: getKey( "ONBOARDING_FIREFOX_EXTENSION_INSTALL_LINK", + "https://addons.mozilla.org/en-GB/firefox/addon/movie-web-extension", ), ONBOARDING_PROXY_INSTALL_LINK: getKey("ONBOARDING_PROXY_INSTALL_LINK"), BACKEND_URL: getKey("BACKEND_URL", BACKEND_URL), From 8ccca76573fbdd2a7e5d4115f5f0aead1c5dad7d Mon Sep 17 00:00:00 2001 From: Jorrin Date: Mon, 11 Mar 2024 23:48:23 +0100 Subject: [PATCH 18/18] Set default onboarding to true --- src/setup/config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/setup/config.ts b/src/setup/config.ts index 98fad29e..a71b997c 100644 --- a/src/setup/config.ts +++ b/src/setup/config.ts @@ -108,7 +108,7 @@ export function conf(): RuntimeConfig { .map((v) => v.trim()) .filter((v) => v.length > 0), NORMAL_ROUTER: getKey("NORMAL_ROUTER", "false") === "true", - HAS_ONBOARDING: getKey("HAS_ONBOARDING", "false") === "true", + HAS_ONBOARDING: getKey("HAS_ONBOARDING", "true") === "true", TURNSTILE_KEY: getKey("TURNSTILE_KEY"), DISALLOWED_IDS: getKey("DISALLOWED_IDS", "") .split(",")