proper var parsing

HolodexNet · Sep 29, 2023 · 00b797a · 00b797a
1 parent ed211c2
commit 00b797a
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 6 deletions.
diff --git a/src/components/media/SongFrame.vue b/src/components/media/SongFrame.vue
@@ -18,6 +18,7 @@
           modestbranding: 1,
           rel: 0,
           cc_load_policy: 0,
+          cc_lang_pref: getLang,
           iv_load_policy: 3,
         }"
         v-on="$listeners"
@@ -30,6 +31,7 @@
 
 <script lang="ts">
 import Youtube from "@/components/player/YoutubePlayer.vue";
+import { langConversion } from "@/utils/consts";
 
 export default {
     name: "SongFrame",
@@ -58,6 +60,10 @@ export default {
         containerClass() {
             return this.isBackground ? "song-player-container-background" : "song-player-container";
         },
+        getLang() {
+            const lang = this.$store.state.settings.lang;
+            return langConversion[lang] || lang;
+        },
     },
     watch: {
         playback: {

diff --git a/src/components/multiview/VideoCell.vue b/src/components/multiview/VideoCell.vue
@@ -31,6 +31,7 @@
         :video-id="cellContent.id"
         :player-vars="{
           playsinline: 1,
+          cc_lang_pref: getLang,
         }"
         :mute="muted"
         manual-update
@@ -58,6 +59,7 @@
 
 <script>
 import { mapMutations } from "vuex";
+import { langConversion } from "@/utils/consts";
 import YoutubePlayer from "../player/YoutubePlayer.vue";
 import CellMixin from "./CellMixin";
 import CellControl from "./CellControl.vue";
@@ -123,6 +125,10 @@ export default {
         isFastFoward() {
             return this.playbackRate !== 1;
         },
+        getLang() {
+            const lang = this.$store.state.settings.lang;
+            return langConversion[lang] || lang;
+        },
     },
     watch: {
         cellContent(nw, old) {

diff --git a/src/components/player/YoutubePlayer.vue b/src/components/player/YoutubePlayer.vue
@@ -5,7 +5,6 @@
 <script>
 import player from "youtube-player";
 import PlayerMixin from "./PlayerMixin";
-import langConversion from "@/utils/consts";
 
 const UNSTARTED = -1;
 const ENDED = 0;
@@ -65,7 +64,6 @@ export default {
             videoId: this.videoId,
             playerVars: this.playerVars,
             origin: window.origin,
-            "cc_lang_pref": this.getLang(),
         });
 
         this.player.on("ready", (e) => this.playerReady(e.target));
@@ -119,10 +117,6 @@ export default {
         isMuted() {
             return this.player.isMuted();
         },
-        getLang() {
-            const lang = this.$store.state.settings.lang;
-            return langConversion[lang] || lang;
-        },
         seekTo(t) {
             this.player.seekTo(t);
         },

diff --git a/src/views/EditVideo.vue b/src/views/EditVideo.vue
@@ -16,6 +16,7 @@
                 ...(timeOffset && { start: timeOffset }),
                 autoplay: 1,
                 playsinline: 1,
+                cc_lang_pref: getLang,
               }"
               @ready="ready"
             />
@@ -249,6 +250,10 @@ export default {
         role() {
             return this.$store.state.userdata?.user?.role;
         },
+        getLang() {
+            const lang = this.$store.state.settings.lang;
+            return langConversion[lang] || lang;
+        },
     },
     watch: {
         // eslint-disable-next-line func-names

diff --git a/src/views/Watch.vue b/src/views/Watch.vue
@@ -34,6 +34,7 @@
               ...(timeOffset && { start: timeOffset }),
               autoplay: isPlaylist ? 1 : 0,
               playsinline: 1,
+              cc_lang_pref: getLang,
             }"
             @ready="ready"
             @playing="playing"
@@ -175,6 +176,7 @@ import WatchHighlights from "@/components/watch/WatchHighlights.vue";
 import WatchToolBar from "@/components/watch/WatchToolbar.vue";
 import WatchComments from "@/components/watch/WatchComments.vue";
 import UploadScript from "@/components/tlscriptmanager/UploadScript.vue";
+import { langConversion } from "@/utils/consts";
 import { decodeHTMLEntities, syncState } from "@/utils/functions";
 import { mapState } from "vuex";
 import { mdiOpenInNew, mdiDockLeft, mdiThumbUp } from "@mdi/js";
@@ -272,6 +274,10 @@ export default {
         showUpload() {
             return this.$store.state.uploadPanel;
         },
+        getLang() {
+            const lang = this.$store.state.settings.lang;
+            return langConversion[lang] || lang;
+        },
     },
     watch: {
         // eslint-disable-next-line func-names