From e06d2d09545ec541f1108ef92ed14276da8def04 Mon Sep 17 00:00:00 2001 From: Rusi Dimitrov Date: Sun, 18 Oct 2020 16:19:08 +0000 Subject: [PATCH 01/24] Translated using Weblate (Bulgarian) Currently translated at 100.0% (400 of 400 strings) Translation: FreeTube/Translations Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/bg/ --- static/locales/bg.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/static/locales/bg.yaml b/static/locales/bg.yaml index 79df9e1ec..d3d2dcd02 100644 --- a/static/locales/bg.yaml +++ b/static/locales/bg.yaml @@ -34,7 +34,7 @@ Version $ is now available! Click for more details: 'Вече е налична за повече детайли' Download From Site: 'Сваляне от сайта' A new blog is now available, $. Click to view more: 'Налична е нова публикация в блога, - $. Щракнете за я видите' + $. Щракнете за да я видите' # Search Bar Search / Go to URL: 'Търсене / Отиване на адрес' @@ -125,7 +125,8 @@ Settings: #! List countries Theme Settings: Theme Settings: 'Настройки на облик' - Match Top Bar with Main Color: 'Съвпадане на горната лента с основния цвят' + Match Top Bar with Main Color: 'Съвпадане на горната лента с основната цветова + тема' Base Theme: Base Theme: 'Основна тема' Black: 'Черна' @@ -149,7 +150,7 @@ Settings: Amber: 'Кехлибарено' Orange: 'Оранжево' Deep Orange: 'Наситено оранжево' - Secondary Color Theme: 'Втора цветова тема' + Secondary Color Theme: 'Вторична цветова тема' #* Main Color Theme UI Scale: Мащаб на интерфейса Disable Smooth Scrolling: Изключване на плавното превъртане @@ -277,7 +278,7 @@ Settings: Hide Comment Likes: Скриване оценките на коментарите Hide Channel Subscribers: Скриване броя на абонатите на канали Hide Video Likes And Dislikes: Скриване оценките на видеата - Hide Video Views: Скриване броя показвания на видеото + Hide Video Views: Скриване броя показвания на видеата Distraction Free Settings: Настройки за неразсейване The app needs to restart for changes to take effect. Restart and apply change?: Приложението трябва да се рестартира за да се приложат промените. Рестартиране? @@ -364,7 +365,7 @@ Channel: Removed subscription from $ other channel(s): 'Премахнат абонамент от $ друг(и) канал(и)' Added channel to your subscriptions: 'Добавен канал към вашите абонаменти' - Search Channel: 'Търсене в канал' + Search Channel: 'Търсене в канала' Your search results have returned 0 results: 'Вашето търсене върна 0 резултата' Sort By: 'Сортиране по' Videos: From 915b30e28464eb75b1459734c7cc16e66b85fcf1 Mon Sep 17 00:00:00 2001 From: Marcin Kunert Date: Sun, 18 Oct 2020 18:12:50 +0000 Subject: [PATCH 02/24] Translated using Weblate (Polish) Currently translated at 100.0% (400 of 400 strings) Translation: FreeTube/Translations Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/pl/ --- static/locales/pl.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/static/locales/pl.yaml b/static/locales/pl.yaml index 7e9df391f..9d70862c2 100644 --- a/static/locales/pl.yaml +++ b/static/locales/pl.yaml @@ -270,14 +270,14 @@ Settings: Data Settings: Ustawienia danych One or more subscriptions were unable to be imported: Nie można było zaimportować conajmniej jednej subskrypcji - Check for Legacy Subscriptions: Sprawdź subskrypcje po starej wersji + Check for Legacy Subscriptions: Sprawdź subskrypcje ze starej wersji Distraction Free Settings: Distraction Free Settings: Ustawienia skupienia uwagi Hide Live Chat: Schowaj czat na żywo Hide Popular Videos: Schowaj filmy „Popularne” Hide Trending Videos: Schowaj filmy „Na czasie” Hide Recommended Videos: Schowaj polecane filmy - Hide Comment Likes: Schowaj łapki w górę komentarzy + Hide Comment Likes: Schowaj polubienia komentarzy Hide Channel Subscribers: Schowaj subskrybentów kanału Hide Video Likes And Dislikes: Schowaj łapki w górę i w dół Hide Video Views: Schowaj obejrzenia filmu From b996ab3be4c37b74804233c0454245e3988bdda5 Mon Sep 17 00:00:00 2001 From: d1c0n Date: Sun, 18 Oct 2020 17:40:42 +0000 Subject: [PATCH 03/24] Translated using Weblate (Italian) Currently translated at 98.7% (395 of 400 strings) Translation: FreeTube/Translations Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/it/ --- static/locales/it.yaml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/static/locales/it.yaml b/static/locales/it.yaml index 00e748c28..fd9a73ff6 100644 --- a/static/locales/it.yaml +++ b/static/locales/it.yaml @@ -75,6 +75,7 @@ Subscriptions: 'Getting Subscriptions. Please wait.': 'Caricamento Iscrizioni. Attendi.' Refresh Subscriptions: Ricarica le Iscrizioni 'Getting Subscriptions. Please wait.': Scaricamento delle iscrizioni. Prego attendere. + Load More Videos: Carica Più Video Trending: 'Tendenze' Most Popular: 'Popolari' Playlists: 'Playlist' @@ -143,6 +144,9 @@ Settings: Deep Orange: 'Arancione scuro' Secondary Color Theme: 'Tema Colori Secondario' #* Main Color Theme + UI Scale: Dimensioni Interfaccia + Disable Smooth Scrolling: Disabilita Scorrimento Fluido + Expand Side Bar by Default: Espandi Automaticamente la Barra Laterale Player Settings: Player Settings: 'Impostazioni Riproduttore Video' Force Local Backend for Legacy Formats: 'Forza back-end locale per formati legacy' @@ -265,6 +269,17 @@ Settings: Select Export Type: Seleziona Tipo di Esportazione Select Import Type: Seleziona Tipo di importazione Data Settings: Impostazioni Dati + Distraction Free Settings: + Hide Popular Videos: Nascondi Video Popolari + Hide Trending Videos: Nascondi Video in Tendenze + Hide Recommended Videos: Nascondi Video Suggeriti + Hide Comment Likes: Nascondi i Mi Piace dei Commenti + Hide Channel Subscribers: Nascondi il Numero di Iscritti + Hide Video Views: Nascondi Visualizzazioni Video + Distraction Free Settings: Impostazioni modalità "Senza Distrazioni" + The app needs to restart for changes to take effect. Restart and apply change?: L'applicazione + deve essere riavviata per applicare i cambiamenti. Riavviare e applicare i cambiamenti + ora? About: #On About page About: 'Informazioni' @@ -401,6 +416,14 @@ Video: Autoplay: Riproduzione Automatica Starting soon, please refresh the page to check again: La riproduzione partirà a breve, refreshare la pagina per ricontrollare + Audio: + Best: Migliore + High: Alto + Medium: Medio + Low: Basso + audio only: solo audio + video only: solo video + Download Video: Scarica Video Videos: #& Sort By Sort By: From 5d73d9830aeb0efb486c7a82bf98b8edf97826e7 Mon Sep 17 00:00:00 2001 From: lucanomax Date: Mon, 19 Oct 2020 12:19:57 +0000 Subject: [PATCH 04/24] Translated using Weblate (Italian) Currently translated at 100.0% (400 of 400 strings) Translation: FreeTube/Translations Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/it/ --- static/locales/it.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/static/locales/it.yaml b/static/locales/it.yaml index fd9a73ff6..f7044d870 100644 --- a/static/locales/it.yaml +++ b/static/locales/it.yaml @@ -75,7 +75,9 @@ Subscriptions: 'Getting Subscriptions. Please wait.': 'Caricamento Iscrizioni. Attendi.' Refresh Subscriptions: Ricarica le Iscrizioni 'Getting Subscriptions. Please wait.': Scaricamento delle iscrizioni. Prego attendere. - Load More Videos: Carica Più Video + Load More Videos: Carica più video + This profile has a large number of subscriptions. Forcing RSS to avoid rate limiting: Questo + profilo ha un grande numero di iscrizioni. Utilizzo RSS per evitare limitazioni Trending: 'Tendenze' Most Popular: 'Popolari' Playlists: 'Playlist' @@ -269,6 +271,7 @@ Settings: Select Export Type: Seleziona Tipo di Esportazione Select Import Type: Seleziona Tipo di importazione Data Settings: Impostazioni Dati + Check for Legacy Subscriptions: Controlla iscrizioni in formato legacy Distraction Free Settings: Hide Popular Videos: Nascondi Video Popolari Hide Trending Videos: Nascondi Video in Tendenze @@ -277,6 +280,8 @@ Settings: Hide Channel Subscribers: Nascondi il Numero di Iscritti Hide Video Views: Nascondi Visualizzazioni Video Distraction Free Settings: Impostazioni modalità "Senza Distrazioni" + Hide Live Chat: Nascondi la chat live + Hide Video Likes And Dislikes: Nascondi Mi piace e Non mi piace The app needs to restart for changes to take effect. Restart and apply change?: L'applicazione deve essere riavviata per applicare i cambiamenti. Riavviare e applicare i cambiamenti ora? @@ -401,7 +406,7 @@ Video: Year: 'Anno' Years: 'Anni' Ago: 'Fa' - Upcoming: 'Première a breve' + Upcoming: 'Première il' Minutes: Minuti Minute: Minuto Published on: 'Pubblicato il' From 07312ec16ae89e0bafc49f811318df1da17f41b0 Mon Sep 17 00:00:00 2001 From: Synkky <41585298+Synkky@users.noreply.github.com> Date: Mon, 19 Oct 2020 14:01:24 +0000 Subject: [PATCH 05/24] Display heart badge on loved comments (#675) * Display heart badge on loved comments * Change red badge to material red (#F44336) * Fix linting issues --- package-lock.json | 6 +-- package.json | 2 +- .../watch-video-comments.css | 37 +++++++++++++++++++ .../watch-video-comments.js | 4 ++ .../watch-video-comments.vue | 17 +++++++++ src/renderer/views/Watch/Watch.vue | 1 + 6 files changed, 63 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index d460f9627..352faa54d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20663,9 +20663,9 @@ } }, "yt-comment-scraper": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/yt-comment-scraper/-/yt-comment-scraper-1.3.6.tgz", - "integrity": "sha512-5OwsFUWqZRpEqk9d0bCPHEXN52X9ZeOZZJ8suUWO6/RtCt7fJ+eHOjXPOgjRIZhYPaLS/MNHRDQ+YFdCZut99g==", + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/yt-comment-scraper/-/yt-comment-scraper-1.3.7.tgz", + "integrity": "sha512-llCtL3x1sDv1AW9t3x/Zz/h8+xb85pCFapoo5q2gs13Xs+8s94L1Z3J/i1uCxjWuU7HpggF5yTvSfmru5LvN9w==", "requires": { "axios": "^0.19.2", "html2json": "^1.0.2" diff --git a/package.json b/package.json index dfe4f4707..a200a3878 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "youtube-chat": "^1.1.0", "youtube-suggest": "^1.1.0", "yt-channel-info": "^1.1.4", - "yt-comment-scraper": "^1.3.6", + "yt-comment-scraper": "^1.3.7", "yt-dash-manifest-generator": "^1.1.0", "yt-trending-scraper": "^1.0.3", "yt-xml2vtt": "^1.1.2", diff --git a/src/renderer/components/watch-video-comments/watch-video-comments.css b/src/renderer/components/watch-video-comments/watch-video-comments.css index ddb33846b..faf516490 100644 --- a/src/renderer/components/watch-video-comments/watch-video-comments.css +++ b/src/renderer/components/watch-video-comments/watch-video-comments.css @@ -61,6 +61,43 @@ margin-top: 0px; } +.commentHeartBadge { + display: inline-block; + position: relative; + width: 25px; + height: 20px; + margin-left: 10px; + margin-bottom: -7px; +} + +.commentHeartBadgeImg { + position: absolute; + left: 0; + width: 15px; + height: 15px; + border-radius: 50%; + -webkit-border-radius: 50%; +} + +.commentHeartBadgeWhite { + position: absolute; + left: 9px; + bottom: 1px; + width: 11px; + height: 11px; + z-index: 1; +} + +.commentHeartBadgeRed { + position: absolute; + color: var(--red-500); + left: 10px; + bottom: 2px; + width: 9px; + height: 9px; + z-index: 2; +} + .commentMoreReplies { font-size: 11px; margin-left: 5px; diff --git a/src/renderer/components/watch-video-comments/watch-video-comments.js b/src/renderer/components/watch-video-comments/watch-video-comments.js index 3364f0289..9b3281a94 100644 --- a/src/renderer/components/watch-video-comments/watch-video-comments.js +++ b/src/renderer/components/watch-video-comments/watch-video-comments.js @@ -19,6 +19,10 @@ export default Vue.extend({ id: { type: String, required: true + }, + channelThumbnail: { + type: String, + required: true } }, data: function () { diff --git a/src/renderer/components/watch-video-comments/watch-video-comments.vue b/src/renderer/components/watch-video-comments/watch-video-comments.vue index abebf4a23..bb2ff828a 100644 --- a/src/renderer/components/watch-video-comments/watch-video-comments.vue +++ b/src/renderer/components/watch-video-comments/watch-video-comments.vue @@ -65,6 +65,23 @@ icon="thumbs-up" /> {{ comment.likes }} + + + + + From b578be10596b3d5e9d5d1450d38b51ab65e467db Mon Sep 17 00:00:00 2001 From: Violet Rose Date: Mon, 19 Oct 2020 07:10:26 -0700 Subject: [PATCH 06/24] Created ft-tooltip component. (#684) --- .../components/ft-tooltip/ft-tooltip.css | 87 +++++++++++++++++++ .../components/ft-tooltip/ft-tooltip.js | 24 +++++ .../components/ft-tooltip/ft-tooltip.vue | 22 +++++ 3 files changed, 133 insertions(+) create mode 100644 src/renderer/components/ft-tooltip/ft-tooltip.css create mode 100644 src/renderer/components/ft-tooltip/ft-tooltip.js create mode 100644 src/renderer/components/ft-tooltip/ft-tooltip.vue diff --git a/src/renderer/components/ft-tooltip/ft-tooltip.css b/src/renderer/components/ft-tooltip/ft-tooltip.css new file mode 100644 index 000000000..03f04a735 --- /dev/null +++ b/src/renderer/components/ft-tooltip/ft-tooltip.css @@ -0,0 +1,87 @@ +.button { + background-color: transparent; + border-style: none; + color: var(--primary-text-color); + cursor: pointer; + font-size: 1rem; + padding: 0; +} + +.button:focus + .text, +.button:hover + .text { + opacity: 1; + visibility: visible; +} + +.button:focus + .text.bottom, +.button:hover + .text.bottom, +.button:focus + .text.top, +.button:hover + .text.top { + -webkit-transform: translate(-50%, 0); + transform: translate(-50%, 0); +} + +.button:focus + .text.left, +.button:hover + .text.left, +.button:focus + .text.right, +.button:hover + .text.right { + -webkit-transform: translate(0, -50%); + transform: translate(0, -50%); +} + +.text { + background-color: black; + border-radius: 2px; + color: #fff; + font-size: 1rem; + line-height: 120%; + margin: 0; + max-width: 10em; + min-width: max-content; + opacity: 0; + padding: 10px 8px; + pointer-events: none; + position: absolute; + text-align: center; + transition-duration: 275ms; + transition-property: opacity, transform, visibility; + visibility: hidden; + z-index: 4; +} + +.text.bottom { + margin-top: 1em; + top: 100%; + left: 50%; + -webkit-transform: translate(-50%, -1em); + transform: translate(-50%, -1em); +} + +.text.left { + margin-right:1em; + right: 100%; + top: 50%; + -webkit-transform: translate(1em, -50%); + transform: translate(1em, -50%); +} + +.text.right { + left: 100%; + margin-left: 1em; + top: 50%; + -webkit-transform: translate(-1em, -50%); + transform: translate(-1em, -50%); +} + +.text.top { + bottom: 100%; + left: 50%; + margin-bottom: 1em; + -webkit-transform: translate(-50%, 1em); + transform: translate(-50%, 1em); +} + +.tooltip { + display: inline-block; + position: relative; +} \ No newline at end of file diff --git a/src/renderer/components/ft-tooltip/ft-tooltip.js b/src/renderer/components/ft-tooltip/ft-tooltip.js new file mode 100644 index 000000000..709b5a805 --- /dev/null +++ b/src/renderer/components/ft-tooltip/ft-tooltip.js @@ -0,0 +1,24 @@ +import Vue from 'vue' +import { uniqueId } from 'lodash' + +export default Vue.extend({ + name: 'FtTooltip', + props: { + position: { + type: String, + default: 'bottom', + validator: (value) => value === 'bottom' || value === 'left' || value === 'right' || value === 'top' + }, + tooltip: { + type: String, + required: true + } + }, + data() { + const id = uniqueId('ft-tooltip-') + + return { + id + } + } +}) diff --git a/src/renderer/components/ft-tooltip/ft-tooltip.vue b/src/renderer/components/ft-tooltip/ft-tooltip.vue new file mode 100644 index 000000000..0f9d01ed6 --- /dev/null +++ b/src/renderer/components/ft-tooltip/ft-tooltip.vue @@ -0,0 +1,22 @@ + + +