fix: added validation for set response lang by browser lang (#1072, #…

…1078)
ilyhalight · Jan 30, 2025 · 4800cf9 · 4800cf9
1 parent 77ab637
commit 4800cf9
Show file tree

Hide file tree

Showing 5 changed files with 98 additions and 40 deletions.
diff --git a/changelog.md b/changelog.md
@@ -13,6 +13,7 @@
 - Исправлено возникновение ошибок на YouTube в GreasyMonkey (#1055)
 - Исправлены слеты шрифта в меню на некоторых сайтах
 - Исправлено некорректное отображение заполнения слайдера после включения опции "Расширенное увеличение громкости видео"
+- Исправлена установка неподдерживаемого языка в качестве языка перевода, если он был установлен как основной язык браузера (#1072, #1078)
 - Убран таймаут при загрузке аудио файла (#1074)
 - Увеличено значение для таймаута при загрузке аудио плеером (#1074)
 - ProtobufJS был заменен на `@bufbuild/protobuf`

diff --git a/dist/vot-min.user.js b/dist/vot-min.user.js
diff --git a/dist/vot.user.js b/dist/vot.user.js
@@ -4816,13 +4816,59 @@ const votStorage = new (class {
     }
 })();
 
+;// ./node_modules/@vot.js/shared/dist/data/consts.js
+const availableLangs = [
+    "auto",
+    "ru",
+    "en",
+    "zh",
+    "ko",
+    "lt",
+    "lv",
+    "ar",
+    "fr",
+    "it",
+    "es",
+    "de",
+    "ja",
+];
+const availableTTS = ["ru", "en", "kk"];
+const subtitlesFormats = ["srt", "vtt", "json"];
+
+
 ;// ./src/utils/utils.js
 
 
 
+
+
 const userlang = navigator.language || navigator.userLanguage;
 const MAX_SECS_FRACTION = 0.66;
+const slavicLangs = [
+  "uk",
+  "be",
+  "bg",
+  "mk",
+  "sr",
+  "bs",
+  "hr",
+  "sl",
+  "pl",
+  "sk",
+  "cs",
+];
 const lang = userlang?.substring(0, 2).toLowerCase() || "en";
+const calculatedResLang = (() => {
+  if (availableTTS.includes(lang)) {
+    return lang;
+  }
+
+  if (slavicLangs.includes(lang)) {
+    return "ru";
+  }
+
+  return "en";
+})();
 
 function secsToStrTime(secs) {
   let minutes = Math.floor(secs / 60);
@@ -7996,26 +8042,6 @@ class NineGAGHelper extends BaseHelper {
     }
 }
 
-;// ./node_modules/@vot.js/shared/dist/data/consts.js
-const availableLangs = [
-    "auto",
-    "ru",
-    "en",
-    "zh",
-    "ko",
-    "lt",
-    "lv",
-    "ar",
-    "fr",
-    "it",
-    "es",
-    "de",
-    "ja",
-];
-const availableTTS = ["ru", "en", "kk"];
-const subtitlesFormats = ["srt", "vtt", "json"];
-
-
 ;// ./node_modules/@vot.js/ext/dist/helpers/youtube.js
 
 
@@ -10789,7 +10815,7 @@ class VideoHandler {
    *
    * @type {import("./index").VideoHandler['translateToLang']}
    */
-  translateToLang = lang;
+  translateToLang = calculatedResLang;
 
   /**
    * @type {import("./index").VideoHandler['timer']}
@@ -11084,7 +11110,9 @@ class VideoHandler {
 
     const dataPromises = {
       autoTranslate: votStorage.get("autoTranslate", 0),
-      dontTranslateLanguage: votStorage.get("dontTranslateLanguage", [lang]),
+      dontTranslateLanguage: votStorage.get("dontTranslateLanguage", [
+        calculatedResLang,
+      ]),
       dontTranslateYourLang: votStorage.get("dontTranslateYourLang", 1),
       autoSetVolumeYandexStyle: votStorage.get("autoSetVolumeYandexStyle", 1),
       autoVolume: votStorage.get("autoVolume", defaultAutoVolume),
@@ -11098,7 +11126,7 @@ class VideoHandler {
       subtitlesFontSize: votStorage.get("subtitlesFontSize", 20),
       subtitlesOpacity: votStorage.get("subtitlesOpacity", 20),
       subtitlesDownloadFormat: votStorage.get("subtitlesDownloadFormat", "srt"),
-      responseLanguage: votStorage.get("responseLanguage", lang),
+      responseLanguage: votStorage.get("responseLanguage", calculatedResLang),
       defaultVolume: votStorage.get("defaultVolume", 100),
       onlyBypassMediaCSP: votStorage.get(
         "onlyBypassMediaCSP",

diff --git a/src/index.js b/src/index.js
@@ -46,6 +46,7 @@ import {
   initHls,
   isPiPAvailable,
   lang,
+  calculatedResLang,
   secsToStrTime,
   downloadBlob,
   clearFileName,
@@ -94,7 +95,7 @@ class VideoHandler {
    *
    * @type {import("./index").VideoHandler['translateToLang']}
    */
-  translateToLang = lang;
+  translateToLang = calculatedResLang;
 
   /**
    * @type {import("./index").VideoHandler['timer']}
@@ -389,7 +390,9 @@ class VideoHandler {
 
     const dataPromises = {
       autoTranslate: votStorage.get("autoTranslate", 0),
-      dontTranslateLanguage: votStorage.get("dontTranslateLanguage", [lang]),
+      dontTranslateLanguage: votStorage.get("dontTranslateLanguage", [
+        calculatedResLang,
+      ]),
       dontTranslateYourLang: votStorage.get("dontTranslateYourLang", 1),
       autoSetVolumeYandexStyle: votStorage.get("autoSetVolumeYandexStyle", 1),
       autoVolume: votStorage.get("autoVolume", defaultAutoVolume),
@@ -403,7 +406,7 @@ class VideoHandler {
       subtitlesFontSize: votStorage.get("subtitlesFontSize", 20),
       subtitlesOpacity: votStorage.get("subtitlesOpacity", 20),
       subtitlesDownloadFormat: votStorage.get("subtitlesDownloadFormat", "srt"),
-      responseLanguage: votStorage.get("responseLanguage", lang),
+      responseLanguage: votStorage.get("responseLanguage", calculatedResLang),
       defaultVolume: votStorage.get("defaultVolume", 100),
       onlyBypassMediaCSP: votStorage.get(
         "onlyBypassMediaCSP",

diff --git a/src/utils/utils.js b/src/utils/utils.js
@@ -1,9 +1,35 @@
+import { availableTTS } from "@vot.js/shared/consts";
+
 import { localizationProvider } from "../localization/localizationProvider.js";
 import debug from "./debug.ts";
 
 const userlang = navigator.language || navigator.userLanguage;
 const MAX_SECS_FRACTION = 0.66;
+const slavicLangs = [
+  "uk",
+  "be",
+  "bg",
+  "mk",
+  "sr",
+  "bs",
+  "hr",
+  "sl",
+  "pl",
+  "sk",
+  "cs",
+];
 export const lang = userlang?.substring(0, 2).toLowerCase() || "en";
+export const calculatedResLang = (() => {
+  if (availableTTS.includes(lang)) {
+    return lang;
+  }
+
+  if (slavicLangs.includes(lang)) {
+    return "ru";
+  }
+
+  return "en";
+})();
 
 function secsToStrTime(secs) {
   let minutes = Math.floor(secs / 60);