web: refactor youtube-lang

- fixed unlocalized "original" string
- added subtitle type exports

web/src/lib/settings/audio-sub-language.ts

@@ -0,0 +1,58 @@
+import { t } from "$lib/i18n/translations";
+import { get } from "svelte/store";
+
+const languages = [
+    "af", "am", "ar", "as", "az",
+    "be", "bg", "bn", "bs", "ca",
+    "cs", "da", "de", "el", "en",
+    "es", "et", "eu", "fa", "fi",
+    "fil", "fr", "gl", "gu", "hi",
+    "hr", "hu", "hy", "id", "is",
+    "it", "iw", "ja", "ka", "kk",
+    "km", "kn", "ko", "ky", "lo",
+    "lt", "lv", "mk", "ml", "mn",
+    "mr", "ms", "my", "no", "ne",
+    "nl", "or", "pa", "pl", "pt",
+    "ro", "ru", "si", "sk", "sl",
+    "sq", "sr", "sv", "sw", "ta",
+    "te", "th", "tr", "uk", "ur",
+    "uz", "vi", "zh", "zh-Hans", "zh-Hant",
+    "zh-CN", "zh-HK", "zh-TW", "zu"
+];
+
+export const youtubeDubLanguages = ["original", ...languages] as const;
+export const subtitleLanguages = ["none", ...languages] as const;
+
+export type YoutubeDubLang = typeof youtubeDubLanguages[number];
+export type SubtitleLang = typeof subtitleLanguages[number];
+
+export const namedYoutubeLanguages = () => {
+    return youtubeDubLanguages.reduce((obj, lang) => {
+        const intlName = new Intl.DisplayNames([lang], { type: 'language' }).of(lang);
+
+        let name = `${intlName} (${lang})`;
+        if (lang === "original") {
+            name = get(t)("settings.youtube.dub.original");
+        }
+
+        return {
+            ...obj,
+            [lang]: name,
+        };
+    }, {}) as Record<YoutubeDubLang, string>;
+}
+
+export const getBrowserLanguage = (): YoutubeDubLang => {
+    if (typeof navigator === 'undefined')
+        return "original";
+
+    const browserLanguage = navigator.language as YoutubeDubLang;
+    if (youtubeDubLanguages.includes(browserLanguage))
+        return browserLanguage;
+
+    const shortened = browserLanguage.split('-')[0] as YoutubeDubLang;
+    if (youtubeDubLanguages.includes(shortened))
+        return shortened;
+
+    return "original";
+}

web/src/lib/settings/migrate.ts

@@ -6,7 +6,7 @@ import type {
     CobaltSettingsV4,
     CobaltSettingsV5,
 } from "$lib/types/settings";
-import { getBrowserLanguage } from "$lib/settings/youtube-lang";
+import { getBrowserLanguage } from "$lib/settings/audio-sub-language";
 
 type Migrator = (s: AllPartialSettingsWithSchema) => AllPartialSettingsWithSchema;
 

web/src/lib/settings/validate.ts

@@ -1,5 +1,5 @@
 import type { Optional } from '$lib/types/generic';
-import defaultSettings from './defaults'
+import defaultSettings from '$lib/settings/defaults';
 import {
     downloadModeOptions,
     filenameStyleOptions,
@@ -9,7 +9,7 @@ import {
     youtubeVideoCodecOptions,
     type PartialSettings,
 } from '$lib/types/settings';
-import { youtubeLanguages } from './youtube-lang';
+import { youtubeDubLanguages } from '$lib/settings/audio-sub-language';
 
 function validateTypes(input: unknown, reference = defaultSettings as unknown) {
     if (typeof input === 'undefined')
@@ -81,7 +81,7 @@ export function validateSettings(settings: PartialSettings) {
             [ settings?.save?.videoQuality     , videoQualityOptions ],
             [ settings?.save?.youtubeVideoCodec, youtubeVideoCodecOptions ],
             [ settings?.save?.savingMethod     , savingMethodOptions ],
-            [ settings?.save?.youtubeDubLang   , youtubeLanguages ]
+            [ settings?.save?.youtubeDubLang   , youtubeDubLanguages ]
         ])
     );
 }

web/src/lib/settings/youtube-lang.ts

@@ -1,115 +0,0 @@
-export const youtubeLanguages = [
-    "original",
-    "af",
-    "am",
-    "ar",
-    "as",
-    "az",
-    "be",
-    "bg",
-    "bn",
-    "bs",
-    "ca",
-    "cs",
-    "da",
-    "de",
-    "el",
-    "en",
-    "es",
-    "et",
-    "eu",
-    "fa",
-    "fi",
-    "fil",
-    "fr",
-    "gl",
-    "gu",
-    "hi",
-    "hr",
-    "hu",
-    "hy",
-    "id",
-    "is",
-    "it",
-    "iw",
-    "ja",
-    "ka",
-    "kk",
-    "km",
-    "kn",
-    "ko",
-    "ky",
-    "lo",
-    "lt",
-    "lv",
-    "mk",
-    "ml",
-    "mn",
-    "mr",
-    "ms",
-    "my",
-    "no",
-    "ne",
-    "nl",
-    "or",
-    "pa",
-    "pl",
-    "pt",
-    "ro",
-    "ru",
-    "si",
-    "sk",
-    "sl",
-    "sq",
-    "sr",
-    "sv",
-    "sw",
-    "ta",
-    "te",
-    "th",
-    "tr",
-    "uk",
-    "ur",
-    "uz",
-    "vi",
-    "zh",
-    "zh-Hans",
-    "zh-Hant",
-    "zh-CN",
-    "zh-HK",
-    "zh-TW",
-    "zu"
-] as const;
-
-export type YoutubeLang = typeof youtubeLanguages[number];
-
-export const namedYoutubeLanguages = () => {
-    return youtubeLanguages.reduce((obj, lang) => {
-        const intlName = new Intl.DisplayNames([lang], { type: 'language' }).of(lang);
-
-        let name = `${intlName} (${lang})`;
-        if (lang === "original") {
-            name = lang;
-        }
-
-        return {
-            ...obj,
-            [lang]: name,
-        };
-    }, {}) as Record<YoutubeLang, string>;
-}
-
-export const getBrowserLanguage = (): YoutubeLang => {
-    if (typeof navigator === 'undefined')
-        return "original";
-
-    const browserLanguage = navigator.language as YoutubeLang;
-    if (youtubeLanguages.includes(browserLanguage))
-        return browserLanguage;
-
-    const shortened = browserLanguage.split('-')[0] as YoutubeLang;
-    if (youtubeLanguages.includes(shortened))
-        return shortened;
-
-    return "original";
-}

web/src/lib/types/settings/v3.ts

@@ -1,9 +1,9 @@
-import type { YoutubeLang } from "$lib/settings/youtube-lang";
+import type { YoutubeDubLang } from "$lib/settings/audio-sub-language";
 import { type CobaltSettingsV2 } from "$lib/types/settings/v2";
 
 export type CobaltSettingsV3 = Omit<CobaltSettingsV2, 'schemaVersion' | 'save'> & {
     schemaVersion: 3,
     save: Omit<CobaltSettingsV2['save'], 'youtubeDubBrowserLang'> & {
-        youtubeDubLang: YoutubeLang;
+        youtubeDubLang: YoutubeDubLang;
     };
 };

web/src/routes/settings/audio/+page.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
     import settings from "$lib/state/settings";
     import { t } from "$lib/i18n/translations";
-    import { namedYoutubeLanguages } from "$lib/settings/youtube-lang";
+    import { namedYoutubeLanguages } from "$lib/settings/audio-sub-language";
 
     import { audioFormatOptions, audioBitrateOptions } from "$lib/types/settings";