From 2c78970f0e33d0ce39df546f8200f88b5caacd25 Mon Sep 17 00:00:00 2001 From: absidue <48293849+absidue@users.noreply.github.com> Date: Thu, 27 Oct 2022 11:34:04 +0200 Subject: [PATCH 1/9] Fix chapters extraction erroring (#2774) --- src/renderer/views/Watch/Watch.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/views/Watch/Watch.js b/src/renderer/views/Watch/Watch.js index 8463b6bee9bbf..eed9b3cb8ad72 100644 --- a/src/renderer/views/Watch/Watch.js +++ b/src/renderer/views/Watch/Watch.js @@ -379,7 +379,7 @@ export default Vue.extend({ const chapters = [] if (!this.hideChapters) { - const rawChapters = result.response.playerOverlays.playerOverlayRenderer.decoratedPlayerBarRenderer?.decoratedPlayerBarRenderer.playerBar?.multiMarkersPlayerBarRenderer.markersMap.find(m => m.key === 'DESCRIPTION_CHAPTERS')?.value.chapters + const rawChapters = result.response.playerOverlays.playerOverlayRenderer.decoratedPlayerBarRenderer?.decoratedPlayerBarRenderer.playerBar?.multiMarkersPlayerBarRenderer.markersMap?.find(m => m.key === 'DESCRIPTION_CHAPTERS')?.value.chapters if (rawChapters) { for (const { chapterRenderer } of rawChapters) { const start = chapterRenderer.timeRangeStartMillis / 1000 From 8f55a648b160f81f673635daa7064cb4c5d29451 Mon Sep 17 00:00:00 2001 From: absidue <48293849+absidue@users.noreply.github.com> Date: Thu, 27 Oct 2022 11:34:39 +0200 Subject: [PATCH 2/9] Cleanup unused component imports (#2773) --- .../components/data-settings/data-settings.js | 4 ---- .../distraction-settings/distraction-settings.js | 10 +--------- .../external-player-settings.js | 2 -- src/renderer/components/ft-button/ft-button.js | 12 +----------- .../components/ft-element-list/ft-element-list.js | 2 -- .../ft-profile-filter-channels-list.js | 2 -- .../components/ft-video-player/ft-video-player.js | 4 ---- .../components/general-settings/general-settings.js | 2 -- .../parental-control-settings.js | 10 +--------- .../components/player-settings/player-settings.js | 2 -- .../components/privacy-settings/privacy-settings.js | 2 -- .../components/proxy-settings/proxy-settings.js | 2 -- .../sponsor-block-settings/sponsor-block-settings.js | 2 -- .../components/theme-settings/theme-settings.js | 2 -- .../components/watch-video-info/watch-video-info.js | 2 -- .../watch-video-live-chat/watch-video-live-chat.js | 4 +--- .../watch-video-playlist/watch-video-playlist.js | 2 -- src/renderer/views/Playlist/Playlist.js | 4 +--- src/renderer/views/Settings/Settings.js | 4 ---- src/renderer/views/Watch/Watch.js | 4 ---- 20 files changed, 5 insertions(+), 73 deletions(-) diff --git a/src/renderer/components/data-settings/data-settings.js b/src/renderer/components/data-settings/data-settings.js index 20d75ee6d16de..b56b7a71a533b 100644 --- a/src/renderer/components/data-settings/data-settings.js +++ b/src/renderer/components/data-settings/data-settings.js @@ -1,9 +1,7 @@ import Vue from 'vue' import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue' import { mapActions, mapMutations } from 'vuex' -import FtCard from '../ft-card/ft-card.vue' import FtButton from '../ft-button/ft-button.vue' -import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue' import FtFlexBox from '../ft-flex-box/ft-flex-box.vue' import FtPrompt from '../ft-prompt/ft-prompt.vue' import { MAIN_PROFILE_ID } from '../../../constants' @@ -25,9 +23,7 @@ export default Vue.extend({ name: 'DataSettings', components: { 'ft-settings-section': FtSettingsSection, - 'ft-card': FtCard, 'ft-button': FtButton, - 'ft-toggle-switch': FtToggleSwitch, 'ft-flex-box': FtFlexBox, 'ft-prompt': FtPrompt }, diff --git a/src/renderer/components/distraction-settings/distraction-settings.js b/src/renderer/components/distraction-settings/distraction-settings.js index 2aecd3c0aac3e..e4d35255e9816 100644 --- a/src/renderer/components/distraction-settings/distraction-settings.js +++ b/src/renderer/components/distraction-settings/distraction-settings.js @@ -1,21 +1,13 @@ import Vue from 'vue' import { mapActions } from 'vuex' import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue' -import FtCard from '../ft-card/ft-card.vue' import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue' -import FtButton from '../ft-button/ft-button.vue' -import FtSelect from '../ft-select/ft-select.vue' -import FtFlexBox from '../ft-flex-box/ft-flex-box.vue' export default Vue.extend({ name: 'PlayerSettings', components: { 'ft-settings-section': FtSettingsSection, - 'ft-card': FtCard, - 'ft-toggle-switch': FtToggleSwitch, - 'ft-button': FtButton, - 'ft-select': FtSelect, - 'ft-flex-box': FtFlexBox + 'ft-toggle-switch': FtToggleSwitch }, computed: { hideVideoViews: function () { diff --git a/src/renderer/components/external-player-settings/external-player-settings.js b/src/renderer/components/external-player-settings/external-player-settings.js index 5e4c684144643..69c58c0561daa 100644 --- a/src/renderer/components/external-player-settings/external-player-settings.js +++ b/src/renderer/components/external-player-settings/external-player-settings.js @@ -1,7 +1,6 @@ import Vue from 'vue' import { mapActions } from 'vuex' import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue' -import FtCard from '../ft-card/ft-card.vue' import FtSelect from '../ft-select/ft-select.vue' import FtInput from '../ft-input/ft-input.vue' import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue' @@ -11,7 +10,6 @@ export default Vue.extend({ name: 'ExternalPlayerSettings', components: { 'ft-settings-section': FtSettingsSection, - 'ft-card': FtCard, 'ft-select': FtSelect, 'ft-input': FtInput, 'ft-toggle-switch': FtToggleSwitch, diff --git a/src/renderer/components/ft-button/ft-button.js b/src/renderer/components/ft-button/ft-button.js index 815c8dfbff36a..afb52938cfc95 100644 --- a/src/renderer/components/ft-button/ft-button.js +++ b/src/renderer/components/ft-button/ft-button.js @@ -1,17 +1,7 @@ import Vue from 'vue' -import FtFlexBox from '../ft-flex-box/ft-flex-box.vue' -import FtListVideo from '../ft-list-video/ft-list-video.vue' -import FtListChannel from '../ft-list-channel/ft-list-channel.vue' -import FtListPlaylist from '../ft-list-playlist/ft-list-playlist.vue' export default Vue.extend({ - name: 'FtElementList', - components: { - 'ft-flex-box': FtFlexBox, - 'ft-list-video': FtListVideo, - 'ft-list-channel': FtListChannel, - 'ft-list-playlist': FtListPlaylist - }, + name: 'FtButton', props: { label: { type: String, diff --git a/src/renderer/components/ft-element-list/ft-element-list.js b/src/renderer/components/ft-element-list/ft-element-list.js index 095ed6be6441f..319d31dc7b22b 100644 --- a/src/renderer/components/ft-element-list/ft-element-list.js +++ b/src/renderer/components/ft-element-list/ft-element-list.js @@ -1,12 +1,10 @@ import Vue from 'vue' -import FtFlexBox from '../ft-flex-box/ft-flex-box.vue' import FtAutoGrid from '../ft-auto-grid/ft-auto-grid.vue' import FtListLazyWrapper from '../ft-list-lazy-wrapper/ft-list-lazy-wrapper.vue' export default Vue.extend({ name: 'FtElementList', components: { - 'ft-flex-box': FtFlexBox, 'ft-auto-grid': FtAutoGrid, 'ft-list-lazy-wrapper': FtListLazyWrapper }, diff --git a/src/renderer/components/ft-profile-filter-channels-list/ft-profile-filter-channels-list.js b/src/renderer/components/ft-profile-filter-channels-list/ft-profile-filter-channels-list.js index c6326e427d302..7ae4cdcf7128c 100644 --- a/src/renderer/components/ft-profile-filter-channels-list/ft-profile-filter-channels-list.js +++ b/src/renderer/components/ft-profile-filter-channels-list/ft-profile-filter-channels-list.js @@ -5,7 +5,6 @@ import FtCard from '../../components/ft-card/ft-card.vue' import FtFlexBox from '../../components/ft-flex-box/ft-flex-box.vue' import FtChannelBubble from '../../components/ft-channel-bubble/ft-channel-bubble.vue' import FtButton from '../../components/ft-button/ft-button.vue' -import FtPrompt from '../../components/ft-prompt/ft-prompt.vue' import FtSelect from '../ft-select/ft-select.vue' import { showToast } from '../../helpers/utils' @@ -16,7 +15,6 @@ export default Vue.extend({ 'ft-flex-box': FtFlexBox, 'ft-channel-bubble': FtChannelBubble, 'ft-button': FtButton, - 'ft-prompt': FtPrompt, 'ft-select': FtSelect }, props: { diff --git a/src/renderer/components/ft-video-player/ft-video-player.js b/src/renderer/components/ft-video-player/ft-video-player.js index 6532f99e2f0a8..32003cddc15e1 100644 --- a/src/renderer/components/ft-video-player/ft-video-player.js +++ b/src/renderer/components/ft-video-player/ft-video-player.js @@ -1,6 +1,5 @@ import Vue from 'vue' import { mapActions } from 'vuex' -import FtCard from '../ft-card/ft-card.vue' import videojs from 'video.js' import qualitySelector from '@silvermine/videojs-quality-selector' @@ -19,9 +18,6 @@ import { calculateColorLuminance, colors, showSaveDialog, showToast } from '../. export default Vue.extend({ name: 'FtVideoPlayer', - components: { - 'ft-card': FtCard - }, beforeRouteLeave: function () { document.removeEventListener('keydown', this.keyboardShortcutHandler) if (this.player !== null) { diff --git a/src/renderer/components/general-settings/general-settings.js b/src/renderer/components/general-settings/general-settings.js index 692dbce6bda90..aa2f05fc55442 100644 --- a/src/renderer/components/general-settings/general-settings.js +++ b/src/renderer/components/general-settings/general-settings.js @@ -1,7 +1,6 @@ import Vue from 'vue' import { mapActions, mapMutations } from 'vuex' import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue' -import FtCard from '../ft-card/ft-card.vue' import FtSelect from '../ft-select/ft-select.vue' import FtInput from '../ft-input/ft-input.vue' import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue' @@ -15,7 +14,6 @@ export default Vue.extend({ name: 'GeneralSettings', components: { 'ft-settings-section': FtSettingsSection, - 'ft-card': FtCard, 'ft-select': FtSelect, 'ft-input': FtInput, 'ft-toggle-switch': FtToggleSwitch, diff --git a/src/renderer/components/parental-control-settings/parental-control-settings.js b/src/renderer/components/parental-control-settings/parental-control-settings.js index b501e7c04f356..10a678e3f8efe 100644 --- a/src/renderer/components/parental-control-settings/parental-control-settings.js +++ b/src/renderer/components/parental-control-settings/parental-control-settings.js @@ -1,21 +1,13 @@ import Vue from 'vue' import { mapActions } from 'vuex' import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue' -import FtCard from '../ft-card/ft-card.vue' import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue' -import FtButton from '../ft-button/ft-button.vue' -import FtSelect from '../ft-select/ft-select.vue' -import FtFlexBox from '../ft-flex-box/ft-flex-box.vue' export default Vue.extend({ name: 'ParentalControlSettings', components: { 'ft-settings-section': FtSettingsSection, - 'ft-card': FtCard, - 'ft-toggle-switch': FtToggleSwitch, - 'ft-button': FtButton, - 'ft-select': FtSelect, - 'ft-flex-box': FtFlexBox + 'ft-toggle-switch': FtToggleSwitch }, computed: { hideSearchBar: function () { diff --git a/src/renderer/components/player-settings/player-settings.js b/src/renderer/components/player-settings/player-settings.js index 58fd411f874e8..66c75e422a977 100644 --- a/src/renderer/components/player-settings/player-settings.js +++ b/src/renderer/components/player-settings/player-settings.js @@ -1,7 +1,6 @@ import Vue from 'vue' import { mapActions } from 'vuex' import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue' -import FtCard from '../ft-card/ft-card.vue' import FtSelect from '../ft-select/ft-select.vue' import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue' import FtSlider from '../ft-slider/ft-slider.vue' @@ -17,7 +16,6 @@ export default Vue.extend({ name: 'PlayerSettings', components: { 'ft-settings-section': FtSettingsSection, - 'ft-card': FtCard, 'ft-select': FtSelect, 'ft-toggle-switch': FtToggleSwitch, 'ft-slider': FtSlider, diff --git a/src/renderer/components/privacy-settings/privacy-settings.js b/src/renderer/components/privacy-settings/privacy-settings.js index 990b024bf7671..4974944a2576f 100644 --- a/src/renderer/components/privacy-settings/privacy-settings.js +++ b/src/renderer/components/privacy-settings/privacy-settings.js @@ -1,7 +1,6 @@ import Vue from 'vue' import { mapActions } from 'vuex' import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue' -import FtCard from '../ft-card/ft-card.vue' import FtButton from '../ft-button/ft-button.vue' import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue' import FtFlexBox from '../ft-flex-box/ft-flex-box.vue' @@ -13,7 +12,6 @@ export default Vue.extend({ name: 'PrivacySettings', components: { 'ft-settings-section': FtSettingsSection, - 'ft-card': FtCard, 'ft-button': FtButton, 'ft-toggle-switch': FtToggleSwitch, 'ft-flex-box': FtFlexBox, diff --git a/src/renderer/components/proxy-settings/proxy-settings.js b/src/renderer/components/proxy-settings/proxy-settings.js index a9877a4ea0ea5..abc50e7283ef2 100644 --- a/src/renderer/components/proxy-settings/proxy-settings.js +++ b/src/renderer/components/proxy-settings/proxy-settings.js @@ -1,7 +1,6 @@ import Vue from 'vue' import { mapActions } from 'vuex' import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue' -import FtCard from '../ft-card/ft-card.vue' import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue' import FtButton from '../ft-button/ft-button.vue' import FtSelect from '../ft-select/ft-select.vue' @@ -21,7 +20,6 @@ export default Vue.extend({ name: 'ProxySettings', components: { 'ft-settings-section': FtSettingsSection, - 'ft-card': FtCard, 'ft-toggle-switch': FtToggleSwitch, 'ft-button': FtButton, 'ft-select': FtSelect, diff --git a/src/renderer/components/sponsor-block-settings/sponsor-block-settings.js b/src/renderer/components/sponsor-block-settings/sponsor-block-settings.js index 30feb58f9e505..80ad8e5167cfd 100644 --- a/src/renderer/components/sponsor-block-settings/sponsor-block-settings.js +++ b/src/renderer/components/sponsor-block-settings/sponsor-block-settings.js @@ -1,7 +1,6 @@ import Vue from 'vue' import { mapActions } from 'vuex' import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue' -import FtCard from '../ft-card/ft-card.vue' import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue' import FtInput from '../ft-input/ft-input.vue' import FtFlexBox from '../ft-flex-box/ft-flex-box.vue' @@ -11,7 +10,6 @@ export default Vue.extend({ name: 'SponsorBlockSettings', components: { 'ft-settings-section': FtSettingsSection, - 'ft-card': FtCard, 'ft-toggle-switch': FtToggleSwitch, 'ft-input': FtInput, 'ft-flex-box': FtFlexBox, diff --git a/src/renderer/components/theme-settings/theme-settings.js b/src/renderer/components/theme-settings/theme-settings.js index 7a962b7a2bf5d..6bc53e3102bb5 100644 --- a/src/renderer/components/theme-settings/theme-settings.js +++ b/src/renderer/components/theme-settings/theme-settings.js @@ -1,7 +1,6 @@ import Vue from 'vue' import { mapActions } from 'vuex' import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue' -import FtCard from '../ft-card/ft-card.vue' import FtSelect from '../ft-select/ft-select.vue' import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue' import FtSlider from '../ft-slider/ft-slider.vue' @@ -13,7 +12,6 @@ export default Vue.extend({ name: 'ThemeSettings', components: { 'ft-settings-section': FtSettingsSection, - 'ft-card': FtCard, 'ft-select': FtSelect, 'ft-toggle-switch': FtToggleSwitch, 'ft-slider': FtSlider, diff --git a/src/renderer/components/watch-video-info/watch-video-info.js b/src/renderer/components/watch-video-info/watch-video-info.js index 4c96dfc0e6e01..eced435b22c7f 100644 --- a/src/renderer/components/watch-video-info/watch-video-info.js +++ b/src/renderer/components/watch-video-info/watch-video-info.js @@ -2,7 +2,6 @@ import Vue from 'vue' import { mapActions } from 'vuex' import FtCard from '../ft-card/ft-card.vue' import FtButton from '../ft-button/ft-button.vue' -import FtFlexBox from '../ft-flex-box/ft-flex-box.vue' import FtIconButton from '../ft-icon-button/ft-icon-button.vue' import FtShareButton from '../ft-share-button/ft-share-button.vue' import { MAIN_PROFILE_ID } from '../../../constants' @@ -14,7 +13,6 @@ export default Vue.extend({ components: { 'ft-card': FtCard, 'ft-button': FtButton, - 'ft-flex-box': FtFlexBox, 'ft-icon-button': FtIconButton, 'ft-share-button': FtShareButton }, diff --git a/src/renderer/components/watch-video-live-chat/watch-video-live-chat.js b/src/renderer/components/watch-video-live-chat/watch-video-live-chat.js index 3c9c63ae67458..64925d7ce3869 100644 --- a/src/renderer/components/watch-video-live-chat/watch-video-live-chat.js +++ b/src/renderer/components/watch-video-live-chat/watch-video-live-chat.js @@ -2,7 +2,6 @@ import Vue from 'vue' import FtLoader from '../ft-loader/ft-loader.vue' import FtCard from '../ft-card/ft-card.vue' import FtButton from '../ft-button/ft-button.vue' -import FtListVideo from '../ft-list-video/ft-list-video.vue' import autolinker from 'autolinker' import { LiveChat } from '@freetube/youtube-chat' @@ -13,8 +12,7 @@ export default Vue.extend({ components: { 'ft-loader': FtLoader, 'ft-card': FtCard, - 'ft-button': FtButton, - 'ft-list-video': FtListVideo + 'ft-button': FtButton }, beforeRouteLeave: function () { this.liveChat.stop() diff --git a/src/renderer/components/watch-video-playlist/watch-video-playlist.js b/src/renderer/components/watch-video-playlist/watch-video-playlist.js index d63ad765014d5..85496e75d11d1 100644 --- a/src/renderer/components/watch-video-playlist/watch-video-playlist.js +++ b/src/renderer/components/watch-video-playlist/watch-video-playlist.js @@ -2,7 +2,6 @@ import Vue from 'vue' import { mapActions } from 'vuex' import FtLoader from '../ft-loader/ft-loader.vue' import FtCard from '../ft-card/ft-card.vue' -import FtFlexBox from '../ft-flex-box/ft-flex-box.vue' import FtListVideo from '../ft-list-video/ft-list-video.vue' import { copyToClipboard, showToast } from '../../helpers/utils' @@ -11,7 +10,6 @@ export default Vue.extend({ components: { 'ft-loader': FtLoader, 'ft-card': FtCard, - 'ft-flex-box': FtFlexBox, 'ft-list-video': FtListVideo }, props: { diff --git a/src/renderer/views/Playlist/Playlist.js b/src/renderer/views/Playlist/Playlist.js index 2fcfb66b03e82..611c891c01b5f 100644 --- a/src/renderer/views/Playlist/Playlist.js +++ b/src/renderer/views/Playlist/Playlist.js @@ -4,7 +4,6 @@ import FtLoader from '../../components/ft-loader/ft-loader.vue' import FtCard from '../../components/ft-card/ft-card.vue' import PlaylistInfo from '../../components/playlist-info/playlist-info.vue' import FtListVideo from '../../components/ft-list-video/ft-list-video.vue' -import FtFlexBox from '../../components/ft-flex-box/ft-flex-box.vue' import i18n from '../../i18n/index' export default Vue.extend({ @@ -13,8 +12,7 @@ export default Vue.extend({ 'ft-loader': FtLoader, 'ft-card': FtCard, 'playlist-info': PlaylistInfo, - 'ft-list-video': FtListVideo, - 'ft-flex-box': FtFlexBox + 'ft-list-video': FtListVideo }, data: function () { return { diff --git a/src/renderer/views/Settings/Settings.js b/src/renderer/views/Settings/Settings.js index e2a6dc9eae59a..92ce91804c166 100644 --- a/src/renderer/views/Settings/Settings.js +++ b/src/renderer/views/Settings/Settings.js @@ -1,6 +1,4 @@ import Vue from 'vue' -import FtCard from '../../components/ft-card/ft-card.vue' -import FtElementList from '../../components/ft-element-list/ft-element-list.vue' import GeneralSettings from '../../components/general-settings/general-settings.vue' import ThemeSettings from '../../components/theme-settings/theme-settings.vue' import PlayerSettings from '../../components/player-settings/player-settings.vue' @@ -18,8 +16,6 @@ import ExperimentalSettings from '../../components/experimental-settings/experim export default Vue.extend({ name: 'Settings', components: { - 'ft-card': FtCard, - 'ft-element-list': FtElementList, 'general-settings': GeneralSettings, 'theme-settings': ThemeSettings, 'player-settings': PlayerSettings, diff --git a/src/renderer/views/Watch/Watch.js b/src/renderer/views/Watch/Watch.js index eed9b3cb8ad72..e2e1f0980601a 100644 --- a/src/renderer/views/Watch/Watch.js +++ b/src/renderer/views/Watch/Watch.js @@ -3,8 +3,6 @@ import { mapActions } from 'vuex' import fs from 'fs' import ytDashGen from 'yt-dash-manifest-generator' import FtLoader from '../../components/ft-loader/ft-loader.vue' -import FtCard from '../../components/ft-card/ft-card.vue' -import FtElementList from '../../components/ft-element-list/ft-element-list.vue' import FtVideoPlayer from '../../components/ft-video-player/ft-video-player.vue' import WatchVideoInfo from '../../components/watch-video-info/watch-video-info.vue' import WatchVideoChapters from '../../components/watch-video-chapters/watch-video-chapters.vue' @@ -23,8 +21,6 @@ export default Vue.extend({ name: 'Watch', components: { 'ft-loader': FtLoader, - 'ft-card': FtCard, - 'ft-element-list': FtElementList, 'ft-video-player': FtVideoPlayer, 'watch-video-info': WatchVideoInfo, 'watch-video-chapters': WatchVideoChapters, From f46132ce2590901d9644b46206f3348941381ac7 Mon Sep 17 00:00:00 2001 From: ChunkyProgrammer <78101139+ChunkyProgrammer@users.noreply.github.com> Date: Thu, 27 Oct 2022 05:34:51 -0400 Subject: [PATCH 3/9] hide `Most Popular` if invidious is disabled (#2772) --- .../side-nav-more-options/side-nav-more-options.js | 6 ++++++ .../side-nav-more-options/side-nav-more-options.vue | 2 +- src/renderer/components/side-nav/side-nav.js | 3 +++ src/renderer/components/side-nav/side-nav.vue | 2 +- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/renderer/components/side-nav-more-options/side-nav-more-options.js b/src/renderer/components/side-nav-more-options/side-nav-more-options.js index 720414487c40d..385a4c8f1ea66 100644 --- a/src/renderer/components/side-nav-more-options/side-nav-more-options.js +++ b/src/renderer/components/side-nav-more-options/side-nav-more-options.js @@ -8,6 +8,12 @@ export default Vue.extend({ } }, computed: { + backendFallback: function () { + return this.$store.getters.getBackendFallback + }, + backendPreference: function () { + return this.$store.getters.getBackendPreference + }, hidePopularVideos: function () { return this.$store.getters.getHidePopularVideos }, diff --git a/src/renderer/components/side-nav-more-options/side-nav-more-options.vue b/src/renderer/components/side-nav-more-options/side-nav-more-options.vue index a14863ea2f095..328cb9b759a91 100644 --- a/src/renderer/components/side-nav-more-options/side-nav-more-options.vue +++ b/src/renderer/components/side-nav-more-options/side-nav-more-options.vue @@ -64,7 +64,7 @@

Date: Thu, 27 Oct 2022 09:31:47 +0000 Subject: [PATCH 4/9] Translated using Weblate (Czech) Currently translated at 100.0% (634 of 634 strings) Translation: FreeTube/Translations Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/cs/ --- static/locales/cs.yaml | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/static/locales/cs.yaml b/static/locales/cs.yaml index 5783433a4dc02..d8f6117ce6ed3 100644 --- a/static/locales/cs.yaml +++ b/static/locales/cs.yaml @@ -29,11 +29,11 @@ Close: 'Zavřít' Back: 'Zpět' Forward: 'Dopředu' -Version {versionNumber} is now available! Click for more details: 'Verze {versionNumber} je k dispozici! Klikněte - pro více informací' +Version {versionNumber} is now available! Click for more details: 'Verze {versionNumber} + je k dispozici! Klikněte pro více informací' Download From Site: 'Stáhnout ze stránky' -A new blog is now available, {blogTitle}. Click to view more: 'Je dostupný nový článek na blogu: - {blogTitle}. Kliknutím zobrazíte více' +A new blog is now available, {blogTitle}. Click to view more: 'Je dostupný nový článek + na blogu: {blogTitle}. Kliknutím zobrazíte více' # Search Bar Search / Go to URL: 'Hledat / Přejít na URL' @@ -156,7 +156,8 @@ Settings: instance Current Invidious Instance: Současná instance Invidious No default instance has been set: Není nastavena žádná výchozí instance - The currently set default instance is {instance}: Současné výchozí instance je {instance} + The currently set default instance is {instance}: Současné výchozí instance je + {instance} External Link Handling: No Action: Žádná akce Ask Before Opening Link: Před otevřením odkazu se zeptat @@ -432,6 +433,11 @@ Settings: Hide Search Bar: Skrýt lištu vyhledávání Show Family Friendly Only: Zobrazit pouze obsah vhodný pro rodiny Hide Unsubscribe Button: Skrýt tlačítko ke zrušení odběru + Experimental Settings: + Experimental Settings: Experimentální nastavení + Warning: Tato nastavení jsou experimentální, při jejich aktivaci dochází k pádům. + Důrazně doporučujeme vytvářet zálohy. Používejte na vlastní nebezpečí! + Replace HTTP Cache: Nahradit mezipaměť HTTP About: #On About page About: 'O aplikaci' @@ -506,7 +512,8 @@ Profile: Your profile name cannot be empty: 'Jméno profilu nemůže být prázdné' Profile has been created: 'Profil byl vytvořen' Profile has been updated: 'Profil byl upraven' - Your default profile has been set to {profile}: 'Váš výchozí profil byl nastaven na {profile}' + Your default profile has been set to {profile}: 'Váš výchozí profil byl nastaven + na {profile}' Removed {profile} from your profiles: 'Odstranit {profile} z vašeho profilu' Your default profile has been changed to your primary profile: 'Váš výchozí profil byl změněn na primární profil' @@ -535,7 +542,8 @@ Channel: Subscribe: 'Odebírat' Unsubscribe: 'Zrušit odběr' Channel has been removed from your subscriptions: 'Kanál byl odebrán z vašich odběrů' - Removed subscription from {count} other channel(s): 'Odběr odebrán z {count} jiných kanálů' + Removed subscription from {count} other channel(s): 'Odběr odebrán z {count} jiných + kanálů' Added channel to your subscriptions: 'K vašim odběrům byl přidán kanál' Search Channel: 'Hledat v kanálu' Your search results have returned 0 results: 'Vaše vyhledávání přineslo 0 výsledků' @@ -830,6 +838,9 @@ Tooltips: že vybraný externí přehrávač lze nalézt přes proměnnou prostředí cesty PATH. V případě potřeby zde lze nastavit vlastní cestu. DefaultCustomArgumentsTemplate: "(Výchozí: '{defaultCustomArguments}')" + Experimental Settings: + Replace HTTP Cache: Zakáže mezipaměť HTTP Electronu a povolí vlastní paměťovou + mezipaměť pro obrázky v paměti. Povede to ke zvýšenému využití RAM. Local API Error (Click to copy): 'Chyba lokálního API (kliknutím zkopírujete)' Invidious API Error (Click to copy): 'Chyba Invidious API (kliknutím zkopírujete)' Falling back to Invidious API: 'Přepínám na Invidious API' @@ -863,8 +874,8 @@ Unknown YouTube url type, cannot be opened in app: Neznámý typ adresy URL YouT nelze v aplikaci otevřít Open New Window: Otevřít nové okno Default Invidious instance has been cleared: Výchozí Invidious instance byla vymazána -Default Invidious instance has been set to {instance}: Výchozí Invidious instance byla nastavena - na {instance} +Default Invidious instance has been set to {instance}: Výchozí Invidious instance + byla nastavena na {instance} Search Bar: Clear Input: Vymazat External link opening has been disabled in the general settings: Otevírání externích From fb228451191a99fe972cda9b67430ec0433ef960 Mon Sep 17 00:00:00 2001 From: Kyotaro Iijima Date: Thu, 27 Oct 2022 13:00:42 +0000 Subject: [PATCH 5/9] Translated using Weblate (Japanese) Currently translated at 100.0% (634 of 634 strings) Translation: FreeTube/Translations Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/ja/ --- static/locales/ja.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/static/locales/ja.yaml b/static/locales/ja.yaml index 5010eeed63972..376b73e964d2c 100644 --- a/static/locales/ja.yaml +++ b/static/locales/ja.yaml @@ -402,6 +402,10 @@ Settings: Parental Control Settings: 制限付きモードの設定 Show Family Friendly Only: ファミリー向けのみ表示 Hide Unsubscribe Button: 登録解除ボタンの非表示 + Experimental Settings: + Replace HTTP Cache: HTTP キャッシュの置換 + Experimental Settings: 実験中の設定 + Warning: この設定項目は実験中であるため、有効にするとクラッシュするかもしれません。バックアップを必ず作成してください。使用は自己責任でお願いします！ About: #On About page About: '概要' @@ -783,6 +787,9 @@ Tooltips: External Player: 外部プレーヤーを選択すると、動画（対応している場合は再生リスト）を開くためのアイコンがサムネイルに表示されます。警告：Invidious の設定は、外部プレーヤーには影響しません。 DefaultCustomArgumentsTemplate: "（デフォルト: '{defaultCustomArguments}'）" + Experimental Settings: + Replace HTTP Cache: Electron のディスクに基づく HTTP キャッシュを無効化し、メモリ内で独自の画像キャッシュを使用します。このことにより + RAM の使用率は増加します。 Playing Next Video Interval: すぐに次の動画を再生します。クリックするとキャンセル。|次の動画を {nextVideoInterval} 秒で再生します。クリックするとキャンセル。|次の動画を {nextVideoInterval} 秒で再生します。クリックするとキャンセル。 More: もっと見る From 73fd7077c8aa9604ea1b410b8c06129abfae35c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B5=D0=BC=D0=B0=D0=BA?= Date: Thu, 27 Oct 2022 12:15:29 +0000 Subject: [PATCH 6/9] Translated using Weblate (Russian) Currently translated at 99.8% (633 of 634 strings) Translation: FreeTube/Translations Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/ru/ --- static/locales/ru.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/static/locales/ru.yaml b/static/locales/ru.yaml index 04264a256bba2..9f761e3683765 100644 --- a/static/locales/ru.yaml +++ b/static/locales/ru.yaml @@ -438,6 +438,11 @@ Settings: Parental Control Settings: Настройки родительского контроля Hide Unsubscribe Button: Скрыть кнопку отписки Hide Search Bar: Скрыть строку поиска + Experimental Settings: + Experimental Settings: Пробные настройки + Replace HTTP Cache: Заменить HTTP-кэш + Warning: Эти настройки являются пробными, они вызывают сбои при включении. Желательно + сделать резервные копии. Используйте на своё усмотрение! About: #On About page About: 'О приложении' From af09a362d73132f23a4e47f6d09689b434dc2de9 Mon Sep 17 00:00:00 2001 From: Massimo Pissarello Date: Fri, 28 Oct 2022 08:20:25 +0000 Subject: [PATCH 7/9] Translated using Weblate (Italian) Currently translated at 100.0% (634 of 634 strings) Translation: FreeTube/Translations Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/it/ --- static/locales/it.yaml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/static/locales/it.yaml b/static/locales/it.yaml index 914363c2f4b1e..683fe4b86f7fe 100644 --- a/static/locales/it.yaml +++ b/static/locales/it.yaml @@ -169,7 +169,7 @@ Settings: Light: 'Chiaro' Dracula: 'Dracula' System Default: Predefinito del sistema - Catppuccin Mocha: Catppuccin moka + Catppuccin Mocha: Cappuccino moka Main Color Theme: Main Color Theme: 'Colore principale del tema' Red: 'Rosso' @@ -195,20 +195,20 @@ Settings: Dracula Purple: 'Dracula viola' Dracula Red: 'Dracula rosso' Dracula Yellow: 'Dracula giallo' - Catppuccin Mocha Pink: Catppuccin moka rosa - Catppuccin Mocha Mauve: Catppuccin moka malva - Catppuccin Mocha Red: Catppuccin moka rosso - Catppuccin Mocha Maroon: Catppuccin moka marrone - Catppuccin Mocha Blue: Catppuccin moka blu - Catppuccin Mocha Green: Catppuccin moka verde - Catppuccin Mocha Sapphire: Catppuccin moka zaffiro - Catppuccin Mocha Yellow: Catppuccin moka giallo - Catppuccin Mocha Rosewater: Catppuccin moka acqua di rose - Catppuccin Mocha Flamingo: Catppuccin moka fenicottero - Catppuccin Mocha Lavender: Catppuccin moka lavanda - Catppuccin Mocha Peach: Catppuccin moka pesca - Catppuccin Mocha Teal: Catppuccin moka alzavola - Catppuccin Mocha Sky: Catppuccin moka cielo + Catppuccin Mocha Pink: Cappuccino moka rosa + Catppuccin Mocha Mauve: Cappuccino moka malva + Catppuccin Mocha Red: Cappuccino moka rosso + Catppuccin Mocha Maroon: Cappuccino moka marrone + Catppuccin Mocha Blue: Cappuccino moka blu + Catppuccin Mocha Green: Cappuccino moka verde + Catppuccin Mocha Sapphire: Cappuccino moka zaffiro + Catppuccin Mocha Yellow: Cappuccino moka giallo + Catppuccin Mocha Rosewater: Cappuccino moka acqua di rose + Catppuccin Mocha Flamingo: Cappuccino moka fenicottero + Catppuccin Mocha Lavender: Cappuccino moka lavanda + Catppuccin Mocha Peach: Cappuccino moka pesca + Catppuccin Mocha Teal: Cappuccino moka alzavola + Catppuccin Mocha Sky: Cappuccino moka cielo Secondary Color Theme: 'Colore secondario del tema' #* Main Color Theme UI Scale: Dimensioni interfaccia utente From 12e93798b727f776ee70e1b76e5b5d4a35bca780 Mon Sep 17 00:00:00 2001 From: SC Date: Fri, 28 Oct 2022 18:13:49 +0000 Subject: [PATCH 8/9] Translated using Weblate (Portuguese) Currently translated at 100.0% (634 of 634 strings) Translation: FreeTube/Translations Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/pt/ --- static/locales/pt.yaml | 39 ++++++++++++++++++++++++++++----------- 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/static/locales/pt.yaml b/static/locales/pt.yaml index edf2c626d7645..a3b59372ed4f1 100644 --- a/static/locales/pt.yaml +++ b/static/locales/pt.yaml @@ -28,11 +28,11 @@ Close: 'Fechar' Back: 'Voltar' Forward: 'Avançar' -Version {versionNumber} is now available! Click for more details: 'A versão {versionNumber} já está disponível! - Clique aqui para mais informações' +Version {versionNumber} is now available! Click for more details: 'A versão {versionNumber} + já está disponível! Clique aqui para mais informações' Download From Site: 'Descarregar do site' -A new blog is now available, {blogTitle}. Click to view more: 'Está disponível um novo blogue, - {blogTitle}. Clique para ver mais' +A new blog is now available, {blogTitle}. Click to view more: 'Está disponível um + novo blogue, {blogTitle}. Clique para ver mais' # Search Bar Search / Go to URL: 'Pesquisar / ir para o URL' @@ -150,7 +150,8 @@ Settings: Current instance will be randomized on startup: A instância irá ser escolhida aleatoriamente ao iniciar No default instance has been set: Não foi definida nenhuma instância - The currently set default instance is {instance}: A instância definida como padrão é {instance} + The currently set default instance is {instance}: A instância definida como padrão + é {instance} Current Invidious Instance: Instância do Invidious atual System Default: Definições do sistema External Link Handling: @@ -437,6 +438,12 @@ Settings: Show Family Friendly Only: Mostrar apenas "para famílias" Hide Search Bar: Ocultar barra de pesquisa Parental Control Settings: Configurações de controlo parental + Experimental Settings: + Replace HTTP Cache: Substituir o cache HTTP + Experimental Settings: Configurações experimentais + Warning: Estas configurações são experimentais, elas causam falhas se estiverem + ativadas. É altamente recomendado fazer cópias de segurança. Use por sua conta + e risco! About: #On About page About: 'Sobre' @@ -513,11 +520,13 @@ Profile: Your profile name cannot be empty: 'O nome do perfil não pode ficar em branco' Profile has been created: 'Perfil criado' Profile has been updated: 'Perfil atualizado' - Your default profile has been set to {profile}: '{profile} é agora o seu perfil padrão' + Your default profile has been set to {profile}: '{profile} é agora o seu perfil + padrão' Removed {profile} from your profiles: 'O perfil {profile} foi eliminado' Your default profile has been changed to your primary profile: 'O seu perfil padrão é agora o seu perfil principal' - '{profile} is now the active profile': 'Está agora a ver as subscrições do perfil {profile}' + '{profile} is now the active profile': 'Está agora a ver as subscrições do perfil + {profile}' Subscription List: 'Lista de subscrições' Other Channels: 'Outros canais' '{number} selected': '{number} selecionado' @@ -543,7 +552,8 @@ Channel: Unsubscribe: 'Anular subscrição' Channel has been removed from your subscriptions: 'O canal foi removido das suas subscrições' - Removed subscription from {count} other channel(s): 'Subscrição removida de mais {count} canais' + Removed subscription from {count} other channel(s): 'Subscrição removida de mais + {count} canais' Added channel to your subscriptions: 'Canal adicionado às suas subscrições' Search Channel: 'Procurar canal' Your search results have returned 0 results: 'Pesquisa devolveu 0 resultados' @@ -811,8 +821,8 @@ No: 'Não' More: Mais Open New Window: Abrir uma nova janela Default Invidious instance has been cleared: Predefinição apagada -Default Invidious instance has been set to {instance}: Servidor Invidious {instance} foi estabelecido - como predefenição +Default Invidious instance has been set to {instance}: Servidor Invidious {instance} + foi estabelecido como predefenição Playing Next Video Interval: A reproduzir o vídeo seguinte imediatamente. Clique para cancelar. | A reproduzir o vídeo seguinte em {nextVideoInterval} segundo. Clique para cancelar. | A reproduzir o vídeo seguinte em {nextVideoInterval} segundos. @@ -881,6 +891,10 @@ Tooltips: External Link Handling: "Escolha o comportamento padrão quando uma ligação, que\ \ não pode ser aberta no FreeTube, é aberta.\nPor padrão, o FreeTube abrirá\ \ a ligação clicado no seu navegador de Internet padrão.\n" + Experimental Settings: + Replace HTTP Cache: Desativa a cache HTTP baseada em disco do Electron e ativa + uma cache de imagem na memória personalizada. Levará ao aumento da utilização + de RAM. Search Bar: Clear Input: Limpar entrada Are you sure you want to open this link?: Quer mesmo abrir esta ligação? @@ -892,10 +906,13 @@ Downloading has completed: '"{videoTitle}" foi descarregado' Screenshot Success: Captura de ecrã guardada como "{filePath}" Screenshot Error: A captura de ecrã falhou. {error} Age Restricted: - The currently set default instance is {instance}: Este {instance} tem restrição de idade + The currently set default instance is {instance}: Este {instance} tem restrição + de idade Type: Channel: Canal Video: Vídeo + This {videoOrPlaylist} is age restricted: Este {videoOrPlaylist} tem restrição de + idade New Window: Nova janela Channels: Count: '{number} canais encontrados.' From 24e17deccc526b9fbaef122dda3bc6fa6464bb43 Mon Sep 17 00:00:00 2001 From: Ivan Boychev Date: Fri, 28 Oct 2022 19:27:11 +0000 Subject: [PATCH 9/9] Translated using Weblate (Bulgarian) Currently translated at 99.6% (632 of 634 strings) Translation: FreeTube/Translations Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/bg/ --- static/locales/bg.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/static/locales/bg.yaml b/static/locales/bg.yaml index 7efce6f266e97..697bb4d1fe633 100644 --- a/static/locales/bg.yaml +++ b/static/locales/bg.yaml @@ -443,6 +443,9 @@ Settings: Hide Unsubscribe Button: Скриване на бутона за отписване Show Family Friendly Only: Показване само за семейства Hide Search Bar: Скриване на лентата за търсене + Experimental Settings: + Experimental Settings: Експериментални настройки + Replace HTTP Cache: Замени HTTP кеша About: #On About page About: 'Относно'