Update variable name to reflect convention, & remove unneeded tooltip

FreeTubeApp · Dec 13, 2023 · 84ccce6 · 84ccce6
1 parent e47ce92
commit 84ccce6
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 12 deletions.
diff --git a/src/renderer/components/ft-video-player/ft-video-player.js b/src/renderer/components/ft-video-player/ft-video-player.js
@@ -321,8 +321,8 @@ export default defineComponent({
       return playbackRates
     },
 
-    enableSubtitles: function () {
-      return this.$store.getters.getEnableSubtitles
+    defaultSubtitles: function () {
+      return this.$store.getters.getDefaultSubtitles
     },
 
     enableScreenshot: function () {
@@ -1878,7 +1878,7 @@ export default defineComponent({
         }, true)
       }
 
-      if (this.enableSubtitles) {
+      if (this.defaultSubtitles) {
         this.toggleCaptions()
       }
     },

diff --git a/src/renderer/components/player-settings/player-settings.js b/src/renderer/components/player-settings/player-settings.js
@@ -80,8 +80,8 @@ export default defineComponent({
       return this.$store.getters.getPlayNextVideo
     },
 
-    enableSubtitles: function () {
-      return this.$store.getters.getEnableSubtitles
+    defaultSubtitles: function () {
+      return this.$store.getters.getDefaultSubtitles
     },
 
     forceLocalBackendForLegacy: function () {
@@ -295,7 +295,7 @@ export default defineComponent({
       'updateAutoplayVideos',
       'updateAutoplayPlaylists',
       'updatePlayNextVideo',
-      'updateEnableSubtitles',
+      'updateDefaultSubtitles',
       'updateForceLocalBackendForLegacy',
       'updateProxyVideos',
       'updateDefaultTheatreMode',

diff --git a/src/renderer/components/player-settings/player-settings.vue b/src/renderer/components/player-settings/player-settings.vue
@@ -22,9 +22,8 @@
         <ft-toggle-switch
           :label="$t('Settings.Player Settings.Turn on Subtitles by Default')"
           :compact="true"
-          :default-value="enableSubtitles"
-          :tooltip="$t('Tooltips.Player Settings.Turn on Subtitles by Default')"
-          @change="updateEnableSubtitles"
+          :default-value="defaultSubtitles"
+          @change="updateDefaultSubtitles"
         />
         <ft-toggle-switch
           :label="$t('Settings.Player Settings.Enable Theatre Mode by Default')"

diff --git a/src/renderer/store/modules/settings.js b/src/renderer/store/modules/settings.js
@@ -179,12 +179,12 @@ const state = {
   defaultProfile: MAIN_PROFILE_ID,
   defaultQuality: '720',
   defaultSkipInterval: 5,
+  defaultSubtitles: false,
   defaultTheatreMode: false,
   defaultVideoFormat: 'dash',
   disableSmoothScrolling: false,
   displayVideoPlayButton: true,
   enableSearchSuggestions: true,
-  enableSubtitles: false,
   enterFullscreenOnDisplayRotate: false,
   externalLinkHandling: '',
   externalPlayer: '',

diff --git a/static/locales/en-US.yaml b/static/locales/en-US.yaml
@@ -867,8 +867,6 @@ Tooltips:
       the playback rate. Press and hold the Control key (Command Key on Mac) and left click the mouse
       to quickly return to the default playback rate (1x unless it has been changed in the settings).
     Skip by Scrolling Over Video Player: Use the scroll wheel to skip through the video, MPV style.
-    Turn on Subtitles by Default: If a video does not have subtitles (auto-generated
-      or otherwise) in your selected locale they will not be enabled by default.
   External Player Settings:
     External Player: Choosing an external player will display an icon, for opening the
       video (playlist if supported) in the external player, on the thumbnail. Warning, Invidious settings do not affect external players.