{
- return item.videoId === this.videoId
+ return item.id === this.videoId
})
return index + 1
@@ -61,13 +61,10 @@ export default Vue.extend({
return this.playlistItems.length
}
},
- watch: {
- videoId () {
- this.playlistWatchedVideoList.push(this.videoId)
- }
- },
mounted: function () {
- if (this.usingElectron) {
+ console.log('mount')
+ if (!this.usingElectron) {
+ console.log('wha')
this.getPlaylistInformationInvidious()
} else {
switch (this.backendPreference) {
@@ -93,12 +90,12 @@ export default Vue.extend({
if (this.loopEnabled) {
this.loopEnabled = false
this.showToast({
- message: 'Loop is now disabled'
+ message: this.$t('Loop is now disabled')
})
} else {
this.loopEnabled = true
this.showToast({
- message: 'Loop is now enabled'
+ message: this.$t('Loop is now enabled')
})
}
},
@@ -107,12 +104,12 @@ export default Vue.extend({
if (this.shuffleEnabled) {
this.shuffleEnabled = false
this.showToast({
- message: 'Shuffle is now disabled'
+ message: this.$t('Shuffle is now disabled')
})
} else {
this.shuffleEnabled = true
this.showToast({
- message: 'Shuffle is now enabled'
+ message: this.$t('Shuffle is now enabled')
})
this.shufflePlaylistItems()
}
@@ -125,7 +122,7 @@ export default Vue.extend({
if (this.shuffleEnabled) {
const videoIndex = this.randomizedPlaylistItems.findIndex((item) => {
- return item === this.videoId
+ return item.id === this.videoId
})
if (videoIndex === this.randomizedPlaylistItems.length - 1) {
@@ -137,12 +134,12 @@ export default Vue.extend({
}
)
this.showToast({
- message: 'Playing Next Video'
+ message: this.$t('Playing Next Video')
})
this.shufflePlaylistItems()
} else {
this.showToast({
- message: 'The playlist has ended. Enable loop to continue playing'
+ message: this.$t('The playlist has ended. Enable loop to continue playing')
})
}
} else {
@@ -153,38 +150,38 @@ export default Vue.extend({
}
)
this.showToast({
- message: 'Playing Next Video'
+ message: this.$t('Playing Next Video')
})
}
} else {
const videoIndex = this.playlistItems.findIndex((item) => {
- return item.videoId === this.videoId
+ return item.id === this.videoId
})
if (videoIndex === this.playlistItems.length - 1) {
if (this.loopEnabled) {
this.$router.push(
{
- path: `/watch/${this.playlistItems[0].videoId}`,
+ path: `/watch/${this.playlistItems[0].id}`,
query: playlistInfo
}
)
this.showToast({
- message: 'Playing Next Video'
+ message: this.$t('Playing Next Video')
})
}
this.showToast({
- message: 'The playlist has ended. Enable loop to continue playing'
+ message: this.$t('The playlist has ended. Enable loop to continue playing')
})
} else {
this.$router.push(
{
- path: `/watch/${this.playlistItems[videoIndex + 1].videoId}`,
+ path: `/watch/${this.playlistItems[videoIndex + 1].id}`,
query: playlistInfo
}
)
this.showToast({
- message: 'Playing Next Video'
+ message: this.$t('Playing Next Video')
})
}
}
@@ -201,7 +198,7 @@ export default Vue.extend({
if (this.shuffleEnabled) {
const videoIndex = this.randomizedPlaylistItems.findIndex((item) => {
- return item.videoId === this.videoId
+ return item.id === this.videoId
})
if (videoIndex === 0) {
@@ -221,20 +218,20 @@ export default Vue.extend({
}
} else {
const videoIndex = this.playlistItems.findIndex((item) => {
- return item.videoId === this.videoId
+ return item.id === this.videoId
})
if (videoIndex === 0) {
this.$router.push(
{
- path: `/watch/${this.playlistItems[this.randomizedPlaylistItems.length - 1].videoId}`,
+ path: `/watch/${this.playlistItems[this.randomizedPlaylistItems.length - 1].id}`,
query: playlistInfo
}
)
} else {
this.$router.push(
{
- path: `/watch/${this.playlistItems[videoIndex - 1].videoId}`,
+ path: `/watch/${this.playlistItems[videoIndex - 1].id}`,
query: playlistInfo
}
)
@@ -245,6 +242,8 @@ export default Vue.extend({
getPlaylistInformationLocal: function () {
this.isLoading = true
+ console.log(this.playlistId)
+
this.$store.dispatch('ytGetPlaylistInfo', this.playlistId).then((result) => {
console.log('done')
console.log(result)
@@ -257,17 +256,24 @@ export default Vue.extend({
this.channelId = result.author.id
this.playlistItems = result.items
-
- this.playlistWatchedVideoList.push(this.videoId)
this.isLoading = false
}).catch((err) => {
console.log(err)
+ const errorMessage = this.$t('Local API Error (Click to copy):')
+ this.showToast({
+ message: `${errorMessage} ${err}`,
+ time: 10000,
+ action: () => {
+ navigator.clipboard.writeText(err)
+ }
+ })
if (this.backendPreference === 'local' && this.backendFallback) {
- console.log('Falling back to Invidious API')
+ this.showToast({
+ message: this.$t('Falling back to Invidious API')
+ })
this.getPlaylistInformationInvidious()
} else {
this.isLoading = false
- // TODO: Show toast with error message
}
})
},
@@ -299,13 +305,23 @@ export default Vue.extend({
this.playlistPage++
this.getPlaylistInformationInvidious()
} else {
- this.playlistWatchedVideoList.push(this.videoId)
this.isLoading = false
}
}).catch((err) => {
console.log(err)
+ const errorMessage = this.$t('Invidious API Error (Click to copy):')
+ this.showToast({
+ message: `${errorMessage} ${err}`,
+ time: 10000,
+ action: () => {
+ navigator.clipboard.writeText(err)
+ }
+ })
if (this.backendPreference === 'invidious' && this.backendFallback) {
console.log('Error getting data with Invidious, falling back to local backend')
+ this.showToast({
+ message: this.$t('Falling back to Local API')
+ })
this.getPlaylistInformationLocal()
} else {
this.isLoading = false
@@ -324,8 +340,8 @@ export default Vue.extend({
this.playlistItems.forEach((item) => {
const randomInt = Math.floor(Math.random() * remainingItems.length)
- if (remainingItems[randomInt].videoId !== this.videoId) {
- items.push(remainingItems[randomInt].videoId)
+ if (remainingItems[randomInt].id !== this.videoId) {
+ items.push(remainingItems[randomInt].id)
}
remainingItems.splice(randomInt, 1)
diff --git a/src/renderer/components/watch-video-playlist/watch-video-playlist.vue b/src/renderer/components/watch-video-playlist/watch-video-playlist.vue
index 460e1674..4eb4dcaf 100644
--- a/src/renderer/components/watch-video-playlist/watch-video-playlist.vue
+++ b/src/renderer/components/watch-video-playlist/watch-video-playlist.vue
@@ -58,7 +58,7 @@
>
diff --git a/src/renderer/views/Watch/Watch.js b/src/renderer/views/Watch/Watch.js
index 8f66d9a5..b0f52821 100644
--- a/src/renderer/views/Watch/Watch.js
+++ b/src/renderer/views/Watch/Watch.js
@@ -482,7 +482,9 @@ export default Vue.extend({
})
console.log(err)
if (!this.usingElectron || (this.backendPreference === 'local' && this.backendFallback)) {
- this.showToast('Falling back to Invidious API')
+ this.showToast({
+ message: this.$t('Falling back to Invidious API')
+ })
this.getVideoInformationInvidious()
}
})
diff --git a/src/renderer/views/Watch/Watch.sass b/src/renderer/views/Watch/Watch.sass
index e07dbf3e..1b05b898 100644
--- a/src/renderer/views/Watch/Watch.sass
+++ b/src/renderer/views/Watch/Watch.sass
@@ -52,7 +52,7 @@
.watchVideoPlaylist, .watchVideoSidebar, .theatrePlaylist
margin: 0 8px 16px
- .watchVideoSidebar, .theatrePlaylist
+ .watchVideoSidebar, .watchVideoPlaylist
height: 500px
.watchVideoRecommendations, .theatreRecommendations
diff --git a/static/locales/en-US.yaml b/static/locales/en-US.yaml
index 32fd8138..44bc24d8 100644
--- a/static/locales/en-US.yaml
+++ b/static/locales/en-US.yaml
@@ -251,6 +251,11 @@ Unsubscribe: Unsubscribe
Video:
Views: Views
Live Now: Live Now
+ Enable Live Chat: Enable Live Chat
+ Live Chat is currently not supported in this build.: Live Chat is currently not supported in this build.
+ 'Chat is disabled or the Live Stream has ended.': Chat is disabled or the Live Stream has ended.
+ Live chat is enabled. Chat messages will appear here once sent.: Live chat is enabled. Chat messages will appear here once sent.
+ 'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.
Published:
Jan: Jan
Feb: Feb
@@ -315,14 +320,29 @@ Share:
Copy Embed: Copy Embed
Open Embed: Open Embed
# On Click
- URL has been copied to the clipboard: URL has been copied to clipboard
+ Invidious URL copied to clipboard: Invidious URL copied to clipboard
+ Invidious Embed URL copied to clipboard: Invidious Embed URL copied to clipboard
+ YouTube URL copied to clipboard: YouTube URL copied to clipboard
+ YouTube Embed URL copied to clipboard: YouTube Embed URL copied to clipboard
Mini Player: Mini Player
-Click to View Comments: Click to View Comments
-Show Comments: Show Comments
+Comments:
+ Comments: Comments
+ Click to View Comments: Click to View Comments
+ Getting comment replies, please wait: Getting comment replies, please wait
+ Show Comments: Show Comments
+ Hide Comments: Hide Comments
+ # Context: View 10 Replies, View 1 Reply
+ View: View
+ Hide: Hide
+ Replies: Replies
+ Reply: Reply
+ There are no comments available for this video: There are no comments available for this video
+ Load More Comments: Load More Comments
Up Next: Up Next
# Toast Messages
Local API Error (Click to copy): Local API Error (Click to copy)
+Invidious API Error (Click to copy): Invidious API Error (Click to copy)
Falling back to Invidious API: Falling back to Invidious API
Falling back to the local API: Falling back to the local API
Subscriptions have not yet been implemented: Subscriptions have not yet been implemented
@@ -334,6 +354,7 @@ Playing Next Video: Playing Next Video
Playing previous video: Playing previous video
Playing next video in 5 seconds. Click to cancel: Playing next video in 5 seconds. Click to cancel
Canceled next video autoplay: Canceled next video autoplay
+'The playlist has ended. Enable loop to continue playing': 'The playlist has ended. Enable loop to continue playing'
Yes: Yes
No: No
- There are no comments available for this video. + {{ $t("There are no comments available for this video") }}
- Load More Comments + {{ $t("Load More Comments") }}
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 cb6ee429..8cd126dd 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 @@ -77,7 +77,7 @@ export default Vue.extend({ created: function () { if (!this.usingElectron) { this.hasError = true - this.errorMessage = 'Live Chat is currently not supported in this build.' + this.errorMessage = this.$t('Video["Live Chat is currently not supported in this build."]') } else { switch (this.backendPreference) { case 'local': @@ -89,7 +89,7 @@ export default Vue.extend({ this.getLiveChatLocal() } else { this.hasError = true - this.errorMessage = 'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.' + this.errorMessage = this.$t('Video["Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required."]') this.showEnableChat = true this.isLoading = false } @@ -120,7 +120,7 @@ export default Vue.extend({ console.log(reason) this.hasError = true this.showEnableChat = false - this.errorMessage = 'Chat is disabled or the Live Stream has ended.' + this.errorMessage = this.$t('Video["Chat is disabled or the Live Stream has ended."]') }) this.liveChat.on('error', (err) => { diff --git a/src/renderer/components/watch-video-live-chat/watch-video-live-chat.vue b/src/renderer/components/watch-video-live-chat/watch-video-live-chat.vue index 9fb5de92..995f56af 100644 --- a/src/renderer/components/watch-video-live-chat/watch-video-live-chat.vue +++ b/src/renderer/components/watch-video-live-chat/watch-video-live-chat.vue @@ -18,7 +18,7 @@ />