From 34fb65e9f813565407af531c2bdd0223ffeaee67 Mon Sep 17 00:00:00 2001 From: Cristi Ciobanu Date: Sun, 20 Oct 2024 15:37:13 +0200 Subject: [PATCH 1/5] update onlyShowLatestFromChannel setting to handle a custom amount of videos --- .../subscription-settings.js | 8 +++++++- .../subscription-settings.vue | 10 +++++++++- src/renderer/helpers/subscriptions.js | 15 ++++++++++++--- src/renderer/store/modules/settings.js | 1 + static/locales/en-US.yaml | 1 + 5 files changed, 30 insertions(+), 5 deletions(-) diff --git a/src/renderer/components/subscription-settings/subscription-settings.js b/src/renderer/components/subscription-settings/subscription-settings.js index 231658a1f..64d33f546 100644 --- a/src/renderer/components/subscription-settings/subscription-settings.js +++ b/src/renderer/components/subscription-settings/subscription-settings.js @@ -2,12 +2,14 @@ import { defineComponent } from 'vue' import { mapActions } from 'vuex' import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue' import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue' +import FtInput from '../ft-input/ft-input.vue' export default defineComponent({ name: 'SubscriptionSettings', components: { 'ft-settings-section': FtSettingsSection, - 'ft-toggle-switch': FtToggleSwitch + 'ft-toggle-switch': FtToggleSwitch, + 'ft-input': FtInput, }, computed: { hideWatchedSubs: function () { @@ -16,6 +18,9 @@ export default defineComponent({ onlyShowLatestFromChannel: function () { return this.$store.getters.getOnlyShowLatestFromChannel }, + onlyShowLatestFromChannelNumber: function () { + return this.$store.getters.getOnlyShowLatestFromChannelNumber + }, useRssFeeds: function () { return this.$store.getters.getUseRssFeeds }, @@ -32,6 +37,7 @@ export default defineComponent({ 'updateUseRssFeeds', 'updateFetchSubscriptionsAutomatically', 'updateOnlyShowLatestFromChannel', + 'updateOnlyShowLatestFromChannelNumber', 'updateUnsubscriptionPopupStatus' ]) } diff --git a/src/renderer/components/subscription-settings/subscription-settings.vue b/src/renderer/components/subscription-settings/subscription-settings.vue index 9ae067ef5..a86d044e2 100644 --- a/src/renderer/components/subscription-settings/subscription-settings.vue +++ b/src/renderer/components/subscription-settings/subscription-settings.vue @@ -27,11 +27,19 @@ @change="updateHideWatchedSubs" /> +
{ if (!video.authorId) { return true - } else if (!authors.has(video.authorId)) { - authors.add(video.authorId) + } + + if (!authors.has(video.authorId)) { + authors.set(video.authorId, 1) return true + } else { + const currentVideos = authors.get(video.authorId) + + if (currentVideos < store.getters.getOnlyShowLatestFromChannelNumber) { + authors.set(video.authorId, currentVideos + 1) + return true + } } return false diff --git a/src/renderer/store/modules/settings.js b/src/renderer/store/modules/settings.js index b790b4da2..0bb840440 100644 --- a/src/renderer/store/modules/settings.js +++ b/src/renderer/store/modules/settings.js @@ -232,6 +232,7 @@ const state = { listType: 'grid', maxVideoPlaybackRate: 3, onlyShowLatestFromChannel: false, + onlyShowLatestFromChannelNumber: 1, playNextVideo: false, proxyHostname: '127.0.0.1', proxyPort: '9050', diff --git a/static/locales/en-US.yaml b/static/locales/en-US.yaml index 636a43eec..b658e3048 100644 --- a/static/locales/en-US.yaml +++ b/static/locales/en-US.yaml @@ -475,6 +475,7 @@ Settings: Fetch Feeds from RSS: Fetch Feeds from RSS Fetch Automatically: Fetch Feed Automatically Only Show Latest Video for Each Channel: Only Show Latest Video for Each Channel + Limit the number of videos displayed for each channel: Limit the number of videos displayed for each channel Confirm Before Unsubscribing: Confirm Before Unsubscribing Distraction Free Settings: Distraction Free Settings: Distraction Free From 937fdbee9cb32d538ecfb9ec9487ac8432dc0c08 Mon Sep 17 00:00:00 2001 From: Cristi Ciobanu Date: Sun, 20 Oct 2024 15:44:15 +0200 Subject: [PATCH 2/5] update layout of subscription settings section --- .../subscription-settings.vue | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/renderer/components/subscription-settings/subscription-settings.vue b/src/renderer/components/subscription-settings/subscription-settings.vue index a86d044e2..2c8f358d0 100644 --- a/src/renderer/components/subscription-settings/subscription-settings.vue +++ b/src/renderer/components/subscription-settings/subscription-settings.vue @@ -18,6 +18,12 @@ :compact="true" @change="updateUseRssFeeds" /> +
-
- -
From bca0e675613e61ba46270581b09deec7173929a7 Mon Sep 17 00:00:00 2001 From: Cristi Ciobanu Date: Tue, 22 Oct 2024 15:39:09 +0200 Subject: [PATCH 3/5] remove unused localisation strings --- static/locales/af.yaml | 1 - static/locales/ar.yaml | 1 - static/locales/be.yaml | 2 -- static/locales/bg.yaml | 2 -- static/locales/cs.yaml | 2 -- static/locales/cy.yaml | 1 - static/locales/da.yaml | 1 - static/locales/de-DE.yaml | 2 -- static/locales/el.yaml | 2 -- static/locales/en-GB.yaml | 1 - static/locales/en-US.yaml | 1 - static/locales/es.yaml | 2 -- static/locales/et.yaml | 1 - static/locales/eu.yaml | 2 -- static/locales/fi.yaml | 2 -- static/locales/fr-FR.yaml | 2 -- static/locales/he.yaml | 1 - static/locales/hr.yaml | 2 -- static/locales/hu.yaml | 2 -- static/locales/id.yaml | 2 -- static/locales/is.yaml | 2 -- static/locales/it.yaml | 2 -- static/locales/ja.yaml | 2 -- static/locales/nl.yaml | 2 -- static/locales/pl.yaml | 2 -- static/locales/pt-BR.yaml | 2 -- static/locales/pt-PT.yaml | 2 -- static/locales/pt.yaml | 2 -- static/locales/ro.yaml | 2 -- static/locales/ru.yaml | 2 -- static/locales/sr.yaml | 2 -- static/locales/sv.yaml | 2 -- static/locales/tr.yaml | 2 -- static/locales/uk.yaml | 2 -- static/locales/vi.yaml | 2 -- static/locales/vls.yaml | 1 - static/locales/zh-CN.yaml | 1 - static/locales/zh-TW.yaml | 1 - 38 files changed, 65 deletions(-) diff --git a/static/locales/af.yaml b/static/locales/af.yaml index 632cdb724..d2a9a2a3c 100644 --- a/static/locales/af.yaml +++ b/static/locales/af.yaml @@ -452,7 +452,6 @@ Settings: Hide Videos on Watch: '' Fetch Feeds from RSS: '' Fetch Automatically: '' - Only Show Latest Video for Each Channel: '' Confirm Before Unsubscribing: '' Distraction Free Settings: Distraction Free Settings: '' diff --git a/static/locales/ar.yaml b/static/locales/ar.yaml index 53695b7d0..0185eadbd 100644 --- a/static/locales/ar.yaml +++ b/static/locales/ar.yaml @@ -446,7 +446,6 @@ Settings: Hide Videos on Watch: 'أخفِ الفيديوهات عند مشاهدتها' Fetch Feeds from RSS: 'جلب المحتوى عن طريق RSS' Fetch Automatically: جلب الخلاصة تلقائيا - Only Show Latest Video for Each Channel: عرض أحدث فيديو فقط لكل قناة Confirm Before Unsubscribing: تجنب إلغاء الاشتراك عن طريق الخطأ Data Settings: diff --git a/static/locales/be.yaml b/static/locales/be.yaml index 79b6e4333..fb8ecc72a 100644 --- a/static/locales/be.yaml +++ b/static/locales/be.yaml @@ -484,8 +484,6 @@ Settings: Fetch Feeds from RSS: 'Атрымліваць стужкі з RSS' Fetch Automatically: 'Аўтаматычна атрымліваць стужку' Confirm Before Unsubscribing: Пацвердзіце перад тым як адпісацца - Only Show Latest Video for Each Channel: Паказваць толькі апошняе відэа для кожнага - канала Distraction Free Settings: Distraction Free Settings: 'Адцягненне ўвагі' Sections: diff --git a/static/locales/bg.yaml b/static/locales/bg.yaml index 7aeaba5b9..293fc9ae3 100644 --- a/static/locales/bg.yaml +++ b/static/locales/bg.yaml @@ -461,8 +461,6 @@ Settings: Hide Videos on Watch: 'Скриване на видеата при гледане' Fetch Feeds from RSS: 'Извличане на съдържания през RSS' Fetch Automatically: Автоматично извличане на съдържание - Only Show Latest Video for Each Channel: Показване само най-новите видеа за всеки - канал Confirm Before Unsubscribing: Избягване на случайно отписване Data Settings: Data Settings: 'Данни' diff --git a/static/locales/cs.yaml b/static/locales/cs.yaml index d464d4c14..21a714d4d 100644 --- a/static/locales/cs.yaml +++ b/static/locales/cs.yaml @@ -461,8 +461,6 @@ Settings: Hide Videos on Watch: 'Skrýt přehraná videa' Fetch Feeds from RSS: 'Získávat odběry z RSS' Fetch Automatically: Automaticky načítat odběry - Only Show Latest Video for Each Channel: U každého kanálu zobrazit pouze nejnovější - video Confirm Before Unsubscribing: Zamezit nechtěným odběrům Distraction Free Settings: Distraction Free Settings: 'Rozptylování' diff --git a/static/locales/cy.yaml b/static/locales/cy.yaml index 79cdef149..8196d5875 100644 --- a/static/locales/cy.yaml +++ b/static/locales/cy.yaml @@ -317,7 +317,6 @@ Settings: Hide Videos on Watch: '' Fetch Feeds from RSS: '' Fetch Automatically: '' - Only Show Latest Video for Each Channel: '' Distraction Free Settings: Distraction Free Settings: '' Sections: diff --git a/static/locales/da.yaml b/static/locales/da.yaml index 4d32f1331..55fefea38 100644 --- a/static/locales/da.yaml +++ b/static/locales/da.yaml @@ -397,7 +397,6 @@ Settings: Subscription Settings: 'Abonnementsindstillinger' Hide Videos on Watch: 'Skjul Videoer på Se' Fetch Feeds from RSS: 'Hent Feeds fra RSS' - Only Show Latest Video for Each Channel: Vis Kun Seneste Video for Hver Kanal Fetch Automatically: Hent Feed Automatisk Confirm Before Unsubscribing: Bekræft Før Afmelding Data Settings: diff --git a/static/locales/de-DE.yaml b/static/locales/de-DE.yaml index 1d4863b43..dcc8d2555 100644 --- a/static/locales/de-DE.yaml +++ b/static/locales/de-DE.yaml @@ -445,8 +445,6 @@ Settings: Hide Videos on Watch: Videos bei Wiedergabe ausblenden Fetch Feeds from RSS: Feeds von RSS abrufen Fetch Automatically: Feed automatisch abrufen - Only Show Latest Video for Each Channel: Nur das neueste Video für jeden Kanal - anzeigen Confirm Before Unsubscribing: Unbeabsichtigtes Deabonnieren verhindern Privacy Settings: diff --git a/static/locales/el.yaml b/static/locales/el.yaml index 7ddc0eaad..c8c3a9127 100644 --- a/static/locales/el.yaml +++ b/static/locales/el.yaml @@ -315,8 +315,6 @@ Settings: Hide Videos on Watch: 'Απόκρυψη των βίντεο κατά την αναπαραγωγή' Fetch Feeds from RSS: 'Φόρτωση τροφοδοσίας RSS' Fetch Automatically: Αυτόματη Λήψη Τροφοδοσίας - Only Show Latest Video for Each Channel: Εμφάνιση μόνο του τελευταίου βίντεο για - κάθε κανάλι Data Settings: Data Settings: 'Ρυθμίσεις Δεδομένων' Select Import Type: 'Επιλογή Τρόπου Εισαγωγής' diff --git a/static/locales/en-GB.yaml b/static/locales/en-GB.yaml index 6e3dd9dad..99b717f89 100644 --- a/static/locales/en-GB.yaml +++ b/static/locales/en-GB.yaml @@ -466,7 +466,6 @@ Settings: Hide Videos on Watch: 'Hide Videos on Watch' Fetch Feeds from RSS: 'Fetch feeds from RSS' Fetch Automatically: Fetch feed automatically - Only Show Latest Video for Each Channel: Only show latest video for each channel Confirm Before Unsubscribing: Confirm before unsubscribing Data Settings: Data Settings: 'Data' diff --git a/static/locales/en-US.yaml b/static/locales/en-US.yaml index b658e3048..17ab28444 100644 --- a/static/locales/en-US.yaml +++ b/static/locales/en-US.yaml @@ -474,7 +474,6 @@ Settings: Hide Videos on Watch: Hide Videos on Watch Fetch Feeds from RSS: Fetch Feeds from RSS Fetch Automatically: Fetch Feed Automatically - Only Show Latest Video for Each Channel: Only Show Latest Video for Each Channel Limit the number of videos displayed for each channel: Limit the number of videos displayed for each channel Confirm Before Unsubscribing: Confirm Before Unsubscribing Distraction Free Settings: diff --git a/static/locales/es.yaml b/static/locales/es.yaml index 0c9c0f5d8..d65f5b0db 100644 --- a/static/locales/es.yaml +++ b/static/locales/es.yaml @@ -463,8 +463,6 @@ Settings: Hide Videos on Watch: 'Ocultar vídeos vistos' Fetch Feeds from RSS: 'Recuperar suministros desde RSS' Fetch Automatically: Obtener los feed automáticamente - Only Show Latest Video for Each Channel: Mostrar solo los últimos vídeos de cada - canal Confirm Before Unsubscribing: Evitar bajas accidentales Data Settings: Data Settings: 'Datos' diff --git a/static/locales/et.yaml b/static/locales/et.yaml index 8c593498d..dd76da31f 100644 --- a/static/locales/et.yaml +++ b/static/locales/et.yaml @@ -457,7 +457,6 @@ Settings: Hide Videos on Watch: 'Vaatamisel peida videod' Fetch Feeds from RSS: 'Laadi RSS-uudisvood' Fetch Automatically: Laadi tellimuste voog automaatselt - Only Show Latest Video for Each Channel: Iga kanali puhul näita vaid viimast videot Confirm Before Unsubscribing: Väldi ekslikku ja juhuslikku tellimusest loobumist Data Settings: Data Settings: 'Andmehaldus' diff --git a/static/locales/eu.yaml b/static/locales/eu.yaml index 7347dfa01..75f97f249 100644 --- a/static/locales/eu.yaml +++ b/static/locales/eu.yaml @@ -457,8 +457,6 @@ Settings: Hide Videos on Watch: 'Ikusten ari zaren bideoa ezkutatu' Fetch Feeds from RSS: 'RSS jarioak eskuratu' Fetch Automatically: Eskuratu jarioa automatikoki - Only Show Latest Video for Each Channel: Erakutsi soilik kanal bakoitzeko azken - bideoa Confirm Before Unsubscribing: Saihestu ustekabeko harpidetza kentzea Distraction Free Settings: Distraction Free Settings: 'Oharkabetasunak ekiditeko ezarpenak' diff --git a/static/locales/fi.yaml b/static/locales/fi.yaml index 5390d4d89..0f37b2a33 100644 --- a/static/locales/fi.yaml +++ b/static/locales/fi.yaml @@ -355,8 +355,6 @@ Settings: Hide Videos on Watch: 'Piilota katsotut videot' Fetch Feeds from RSS: Nouda RSS-syöte Fetch Automatically: Nouda syöte automaattisesti - Only Show Latest Video for Each Channel: Näytä vain jokaisen kanavan uusin video - Privacy Settings: Watch history has been cleared: Katseluhistoria poistettiin Are you sure you want to remove your entire watch history?: Haluatko varmasti diff --git a/static/locales/fr-FR.yaml b/static/locales/fr-FR.yaml index 342a94f43..9b39996bc 100644 --- a/static/locales/fr-FR.yaml +++ b/static/locales/fr-FR.yaml @@ -452,8 +452,6 @@ Settings: Hide Videos on Watch: 'Masquer les vidéos visionnées' Fetch Feeds from RSS: Récupération de flux RSS Fetch Automatically: Récupération automatique des flux - Only Show Latest Video for Each Channel: Afficher uniquement la dernière vidéo - pour chaque chaîne Confirm Before Unsubscribing: Évitez les désabonnements accidentels Privacy Settings: diff --git a/static/locales/he.yaml b/static/locales/he.yaml index adb95d7e7..e20893831 100644 --- a/static/locales/he.yaml +++ b/static/locales/he.yaml @@ -445,7 +445,6 @@ Settings: Fetch Feeds from RSS: 'ייבוא עדכונים בעזרת RSS' Fetch Automatically: משיכת ערוץ העדכונים אוטומטית Confirm Before Unsubscribing: אישור לפני ביטול מינוי - Only Show Latest Video for Each Channel: להציג רק את הסרטון האחרון לכל ערוץ Data Settings: Data Settings: 'נתונים' Select Import Type: 'נא לבחור את תסדיר הייבוא' diff --git a/static/locales/hr.yaml b/static/locales/hr.yaml index 7d1467ab3..95812af6d 100644 --- a/static/locales/hr.yaml +++ b/static/locales/hr.yaml @@ -446,8 +446,6 @@ Settings: Hide Videos on Watch: 'Sakrij video nakon gledanja' Fetch Feeds from RSS: 'Dohvati feedove s RSS-a' Fetch Automatically: Automatski dohvati feed - Only Show Latest Video for Each Channel: Prikaži samo najnoviji video za svaki - kanal Confirm Before Unsubscribing: Izbjegni slučajno otkazivanje pretplate Data Settings: diff --git a/static/locales/hu.yaml b/static/locales/hu.yaml index 99cc50b4d..6803cb92d 100644 --- a/static/locales/hu.yaml +++ b/static/locales/hu.yaml @@ -469,8 +469,6 @@ Settings: Hide Videos on Watch: 'Videók elrejtése megtekintés után' Fetch Feeds from RSS: 'RSS-hírcsatornák beolvasása' Fetch Automatically: Hírcsatorna automatikus lekérdezése - Only Show Latest Video for Each Channel: Csak a legújabb videókat jelenítse meg - a csatornáktól Confirm Before Unsubscribing: Kerülje el a véletlen leiratkozást Data Settings: Data Settings: 'Adat' diff --git a/static/locales/id.yaml b/static/locales/id.yaml index 82de6149d..af26c30a9 100644 --- a/static/locales/id.yaml +++ b/static/locales/id.yaml @@ -347,8 +347,6 @@ Settings: Hide Videos on Watch: 'Sembunyikan Video saat Menonton' Fetch Feeds from RSS: 'Ambil Umpan dari RSS' Fetch Automatically: Ambil Umpan Secara Otomatis - Only Show Latest Video for Each Channel: Hanya Tampilkan Video Terbaru untuk Setiap - Kanal Data Settings: Data Settings: 'Pengaturan Data' Select Import Type: 'Pilih Tipe Impor' diff --git a/static/locales/is.yaml b/static/locales/is.yaml index e333412b5..526fde806 100644 --- a/static/locales/is.yaml +++ b/static/locales/is.yaml @@ -465,8 +465,6 @@ Settings: Hide Videos on Watch: 'Fela myndskeið eftir áhorf' Fetch Feeds from RSS: 'Ná í streymi úr RSS' Fetch Automatically: Sækja streymi sjálfvirkt - Only Show Latest Video for Each Channel: Aðeins birta nýjasta myndskeið fyrir - hverja myndskeiðarás Confirm Before Unsubscribing: Staðfesta uppsögn áskriftar Distraction Free Settings: Distraction Free Settings: 'Truflanaminnkandi' diff --git a/static/locales/it.yaml b/static/locales/it.yaml index 9904ca3ec..01aaf0b0c 100644 --- a/static/locales/it.yaml +++ b/static/locales/it.yaml @@ -460,8 +460,6 @@ Settings: Hide Videos on Watch: 'Nascondi i video visualizzati' Fetch Feeds from RSS: Scarica gli aggiornamenti dai flussi RSS Fetch Automatically: Recupera i feed automaticamente - Only Show Latest Video for Each Channel: Mostra solo il video più recente per - ciascun canale Confirm Before Unsubscribing: Evita la cancellazione accidentale dell'iscrizione Data Settings: diff --git a/static/locales/ja.yaml b/static/locales/ja.yaml index 6128ba7e9..68a95a4f7 100644 --- a/static/locales/ja.yaml +++ b/static/locales/ja.yaml @@ -397,8 +397,6 @@ Settings: Fetch Feeds from RSS: RSS から情報取得 Fetch Automatically: フィードの自動取得 Confirm Before Unsubscribing: 登録解除する前に確認画面を表示する - Only Show Latest Video for Each Channel: 各チャンネルの最新動画のみを表示する - Privacy Settings: Save Watched Progress: 再生位置の保存 Remember History: 履歴の保存 diff --git a/static/locales/nl.yaml b/static/locales/nl.yaml index fcaba8aaa..c18396975 100644 --- a/static/locales/nl.yaml +++ b/static/locales/nl.yaml @@ -448,8 +448,6 @@ Settings: Hide Videos on Watch: 'Bekeken video''s verbergen' Fetch Feeds from RSS: Feeds ophalen via RSS Fetch Automatically: Feed automatisch ophalen - Only Show Latest Video for Each Channel: Alleen nieuwste video voor elk kanaal - tonen Confirm Before Unsubscribing: Onbedoeld deabonneren voor­komen Data Settings: diff --git a/static/locales/pl.yaml b/static/locales/pl.yaml index 21a156635..a612d4743 100644 --- a/static/locales/pl.yaml +++ b/static/locales/pl.yaml @@ -436,8 +436,6 @@ Settings: Hide Videos on Watch: 'Ukrywaj filmy po obejrzeniu' Fetch Feeds from RSS: Pobierz subskrypcje z RSS Fetch Automatically: Automatycznie odświeżaj subskrypcje - Only Show Latest Video for Each Channel: Pokaż tylko najnowszy film z każdego - kanału Confirm Before Unsubscribing: Uniknij przypadkowego usunięcia subskrypcji Privacy Settings: diff --git a/static/locales/pt-BR.yaml b/static/locales/pt-BR.yaml index 293df09db..e9e43eb70 100644 --- a/static/locales/pt-BR.yaml +++ b/static/locales/pt-BR.yaml @@ -431,8 +431,6 @@ Settings: Hide Videos on Watch: 'Ocultar vídeos após assisti-los' Fetch Feeds from RSS: Buscar Informações através de RSS Fetch Automatically: Buscar feed automaticamente - Only Show Latest Video for Each Channel: Mostrar apenas vídeo mais recente para - cada canal Confirm Before Unsubscribing: Evitar cancelamento acidental de inscrições Privacy Settings: diff --git a/static/locales/pt-PT.yaml b/static/locales/pt-PT.yaml index 78b6e650a..f225d4fb1 100644 --- a/static/locales/pt-PT.yaml +++ b/static/locales/pt-PT.yaml @@ -436,8 +436,6 @@ Settings: Hide Videos on Watch: Ocultar vídeos visualizados Fetch Feeds from RSS: Obter subscrições através de RSS Fetch Automatically: Obter fontes automaticamente - Only Show Latest Video for Each Channel: Mostrar apenas o último vídeo de cada - canal Confirm Before Unsubscribing: Impedir cancelamento acidental de subscrições Distraction Free Settings: Distraction Free Settings: Definições de distrações diff --git a/static/locales/pt.yaml b/static/locales/pt.yaml index 0af89a93b..71c50c555 100644 --- a/static/locales/pt.yaml +++ b/static/locales/pt.yaml @@ -448,8 +448,6 @@ Settings: Hide Videos on Watch: 'Ocultar vídeos visualizados' Fetch Feeds from RSS: 'Obter subscrições através de RSS' Fetch Automatically: Obter fontes automaticamente - Only Show Latest Video for Each Channel: Mostrar apenas o último vídeo de cada - canal Confirm Before Unsubscribing: Impedir cancelamento acidental de subscrições Data Settings: Data Settings: 'Dados' diff --git a/static/locales/ro.yaml b/static/locales/ro.yaml index d42ea5029..a216dd58f 100644 --- a/static/locales/ro.yaml +++ b/static/locales/ro.yaml @@ -438,8 +438,6 @@ Settings: Fetch Feeds from RSS: 'Preluare de fluxuri din RSS' Fetch Automatically: Preluați feedul automat Confirm Before Unsubscribing: Confirmă înainte de dezabonare - Only Show Latest Video for Each Channel: Arată doar cele mai noi videoclipuri - pentru fiecare canal Data Settings: Data Settings: 'Setări de date' Select Import Type: 'Selectează tipul de import' diff --git a/static/locales/ru.yaml b/static/locales/ru.yaml index d51289187..eb75b9c87 100644 --- a/static/locales/ru.yaml +++ b/static/locales/ru.yaml @@ -427,8 +427,6 @@ Settings: Hide Videos on Watch: 'Скрывать видео после просмотра' Fetch Feeds from RSS: Получать ленты из RSS Fetch Automatically: Автоматически получать ленту - Only Show Latest Video for Each Channel: Показывать только последние видео для - каждого канала Confirm Before Unsubscribing: Подтвердить, прежде чем отписаться Privacy Settings: diff --git a/static/locales/sr.yaml b/static/locales/sr.yaml index cc4c38997..f44cb09f4 100644 --- a/static/locales/sr.yaml +++ b/static/locales/sr.yaml @@ -466,8 +466,6 @@ Settings: Hide Videos on Watch: 'Сакриј видео снимке на гледању' Fetch Feeds from RSS: 'Прикупи фидове из RSS-а' Fetch Automatically: Аутоматски прикупи фид - Only Show Latest Video for Each Channel: Прикажи само најновији видео снимак за - сваки канал Confirm Before Unsubscribing: Избегни случајно отпраћивање Distraction Free Settings: Distraction Free Settings: 'Без ометања' diff --git a/static/locales/sv.yaml b/static/locales/sv.yaml index 5764aeebb..cfcf6b001 100644 --- a/static/locales/sv.yaml +++ b/static/locales/sv.yaml @@ -397,8 +397,6 @@ Settings: Hide Videos on Watch: 'Dölj video under visning' Fetch Feeds from RSS: 'Hämta prenumerationer från RSS' Fetch Automatically: Hämta flöde automatiskt - Only Show Latest Video for Each Channel: Visa endast den senaste videon för varje - kanal Data Settings: Data Settings: 'Datainställningar' Select Import Type: 'Välj import-typen' diff --git a/static/locales/tr.yaml b/static/locales/tr.yaml index a3ddbc8c9..7ae988605 100644 --- a/static/locales/tr.yaml +++ b/static/locales/tr.yaml @@ -455,8 +455,6 @@ Settings: Hide Videos on Watch: 'İzlenmiş Videoları Gizle' Fetch Feeds from RSS: 'Akışları RSS''den Getir' Fetch Automatically: Akışı Otomatik Olarak Getir - Only Show Latest Video for Each Channel: Her Kanal için Yalnızca En Son Videoyu - Göster Confirm Before Unsubscribing: Abonelikten Çıkmadan Önce Onayla Data Settings: Data Settings: 'Veri' diff --git a/static/locales/uk.yaml b/static/locales/uk.yaml index 7246060c7..77cd3511d 100644 --- a/static/locales/uk.yaml +++ b/static/locales/uk.yaml @@ -349,8 +349,6 @@ Settings: Hide Videos on Watch: 'Ховати відео при перегляді' Fetch Feeds from RSS: 'Отримати канали з RSS' Fetch Automatically: Автоматично отримувати стрічку - Only Show Latest Video for Each Channel: Показувати лише останні відео для кожного - каналу Distraction Free Settings: Distraction Free Settings: 'Налаштування зосередження' Hide Video Views: 'Сховати перегляди відео' diff --git a/static/locales/vi.yaml b/static/locales/vi.yaml index 8f782bfd1..e831c8a29 100644 --- a/static/locales/vi.yaml +++ b/static/locales/vi.yaml @@ -422,8 +422,6 @@ Settings: Hide Videos on Watch: 'Ẩn video khi đã xem' Fetch Feeds from RSS: Cập nhật bảng tin qua RSS Fetch Automatically: Tự động làm mới bảng tin - Only Show Latest Video for Each Channel: Chỉ hiện video mới nhất cho mỗi kênh - Confirm Before Unsubscribing: Nhắc xác nhận trước khi hủy đăng ký Data Settings: How do I import my subscriptions?: Làm sao để tôi nhập đăng ký? diff --git a/static/locales/vls.yaml b/static/locales/vls.yaml index 6b30a767b..157d1c32c 100644 --- a/static/locales/vls.yaml +++ b/static/locales/vls.yaml @@ -460,7 +460,6 @@ Settings: Hide Videos on Watch: '' Fetch Feeds from RSS: '' Fetch Automatically: '' - Only Show Latest Video for Each Channel: '' Confirm Before Unsubscribing: '' Distraction Free Settings: Distraction Free Settings: '' diff --git a/static/locales/zh-CN.yaml b/static/locales/zh-CN.yaml index 981f4dad0..9179ce03b 100644 --- a/static/locales/zh-CN.yaml +++ b/static/locales/zh-CN.yaml @@ -394,7 +394,6 @@ Settings: Hide Videos on Watch: '观看时隐藏视频' Fetch Feeds from RSS: 从RSS摘取推送 Fetch Automatically: 自动抓取订阅源 - Only Show Latest Video for Each Channel: 只显示每个频道的最新视频 Confirm Before Unsubscribing: 避免意外取消订阅 Privacy Settings: diff --git a/static/locales/zh-TW.yaml b/static/locales/zh-TW.yaml index 2d58157ac..f5907adcc 100644 --- a/static/locales/zh-TW.yaml +++ b/static/locales/zh-TW.yaml @@ -393,7 +393,6 @@ Settings: Hide Videos on Watch: '觀看時隱藏影片' Fetch Feeds from RSS: 從RSS擷取推送 Fetch Automatically: 自動擷取 Feed - Only Show Latest Video for Each Channel: 只顯示每個頻道的最新影片 Confirm Before Unsubscribing: 避免意外取消訂閱 Privacy Settings: From aea5e5df920375dd3b95009a1c9d3a7ff93e3b11 Mon Sep 17 00:00:00 2001 From: Cristi Ciobanu Date: Tue, 22 Oct 2024 15:39:36 +0200 Subject: [PATCH 4/5] add labelledby attribute and update styling --- .../subscription-settings.scss | 12 +++++++ .../subscription-settings.vue | 33 +++++++++++-------- static/locales/en-US.yaml | 1 + 3 files changed, 32 insertions(+), 14 deletions(-) create mode 100644 src/renderer/components/subscription-settings/subscription-settings.scss diff --git a/src/renderer/components/subscription-settings/subscription-settings.scss b/src/renderer/components/subscription-settings/subscription-settings.scss new file mode 100644 index 000000000..8c152e875 --- /dev/null +++ b/src/renderer/components/subscription-settings/subscription-settings.scss @@ -0,0 +1,12 @@ +.onlyShowLatestFromChannel { + display: inline-flex; + + div:nth-child(2) { + margin-inline-start: 1em; + inline-size: 68px; + + input { + margin-block-end: 0; + } + } +} diff --git a/src/renderer/components/subscription-settings/subscription-settings.vue b/src/renderer/components/subscription-settings/subscription-settings.vue index 2c8f358d0..93d5ecbea 100644 --- a/src/renderer/components/subscription-settings/subscription-settings.vue +++ b/src/renderer/components/subscription-settings/subscription-settings.vue @@ -32,23 +32,28 @@ :compact="true" @change="updateHideWatchedSubs" /> - - +
+ + +