From 82965211b7cac40d17760df9b45d8874d389da82 Mon Sep 17 00:00:00 2001 From: Mitchel Paulin Date: Tue, 13 Feb 2024 16:34:31 -0500 Subject: [PATCH 001/127] Remove excessive punctuation as part of distraction settings (#4673) * Remove excessive punctuation * Update static/locales/en-US.yaml Co-authored-by: PikachuEXE * Remove pipe --------- Co-authored-by: PikachuEXE --- src/renderer/helpers/utils.js | 8 ++++++-- static/locales/en-US.yaml | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/renderer/helpers/utils.js b/src/renderer/helpers/utils.js index 0a4f3d5a8..4fde63b77 100644 --- a/src/renderer/helpers/utils.js +++ b/src/renderer/helpers/utils.js @@ -616,9 +616,10 @@ export function getVideoParamsFromUrl(url) { /** * This will match sequences of upper case characters and convert them into title cased words. + * This will also match excessive strings of punctionation and convert them to one representative character * @param {string} title the title to process * @param {number} minUpperCase the minimum number of consecutive upper case characters to match - * @returns {string} the title with upper case characters removed + * @returns {string} the title with upper case characters removed and punctuation normalized */ export function toDistractionFreeTitle(title, minUpperCase = 3) { const firstValidCharIndex = (word) => { @@ -634,7 +635,10 @@ export function toDistractionFreeTitle(title, minUpperCase = 3) { } const reg = RegExp(`[\\p{Lu}|']{${minUpperCase},}`, 'ug') - return title.replace(reg, x => capitalizedWord(x.toLowerCase())) + return title + .replaceAll(/!{2,}/g, '!') + .replaceAll(/[!?]{2,}/g, '?') + .replace(reg, x => capitalizedWord(x.toLowerCase())) } export function formatNumber(number, options = undefined) { diff --git a/static/locales/en-US.yaml b/static/locales/en-US.yaml index 0289cf6a4..179753781 100644 --- a/static/locales/en-US.yaml +++ b/static/locales/en-US.yaml @@ -451,7 +451,7 @@ Settings: Hide Video Description: Hide Video Description Hide Comments: Hide Comments Hide Profile Pictures in Comments: Hide Profile Pictures in Comments - Display Titles Without Excessive Capitalisation: Display Titles Without Excessive Capitalisation + Display Titles Without Excessive Capitalisation: Display Titles Without Excessive Capitalisation And Punctuation Hide Live Streams: Hide Live Streams Hide Upcoming Premieres: Hide Upcoming Premieres Hide Sharing Actions: Hide Sharing Actions From ee3c905eb86803a82a9783da551813f6f933f976 Mon Sep 17 00:00:00 2001 From: NEXI Date: Tue, 13 Feb 2024 00:03:51 +0000 Subject: [PATCH 002/127] Translated using Weblate (Serbian) Currently translated at 100.0% (815 of 815 strings) Translation: FreeTube/Translations Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/sr/ --- static/locales/sr.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/static/locales/sr.yaml b/static/locales/sr.yaml index c94823975..8e52ad428 100644 --- a/static/locales/sr.yaml +++ b/static/locales/sr.yaml @@ -296,6 +296,7 @@ Settings: Hot Pink: Врућа розе Catppuccin Mocha: Catppuccin Mocha System Default: Системски подразумевано + Nordic: Нордичка Main Color Theme: Main Color Theme: 'Главна тема боја' Red: 'Црвена' From 28cc5ef76d45ad497da86b3563f411e51dffa14d Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 13 Feb 2024 21:34:59 +0000 Subject: [PATCH 003/127] Translated using Weblate (Norwegian Nynorsk) Currently translated at 79.5% (648 of 815 strings) Translation: FreeTube/Translations Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/nn/ --- static/locales/nn.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/static/locales/nn.yaml b/static/locales/nn.yaml index 096db71c1..f91adbfac 100644 --- a/static/locales/nn.yaml +++ b/static/locales/nn.yaml @@ -770,9 +770,9 @@ Tooltips: Invidious Instance: 'Invidious-førekomsten som FreeTube vil kople til for API-kall.' Region for Trending: 'Trendsregionen lar deg enkelt velje kva lands populære videoar du ynskjer å vise.' - External Link Handling: "Vel kva FreeTube skal gjer, når ein trykker på ei lenke,\ - \ som ikkje kan bli opna av FreeTube. \nFreeTube vil vanlegvis opne lenka i\ - \ din standardnettlesar.\n" + External Link Handling: "Vel kva FreeTube skal gjer, når ein trykker på ei lenke, + som ikkje kan bli opna av FreeTube. \nFreeTube vil vanlegvis opne lenka i din + standardnettlesar.\n" Player Settings: Force Local Backend for Legacy Formats: 'Fungerer berre med Invidious-API-et som standard. Når det er påslått, vil det lokale API-et køyre og bruke dei utdaterte From d335151d042dcfb3298c4724caf026c72c5fb7f1 Mon Sep 17 00:00:00 2001 From: Emma Date: Wed, 14 Feb 2024 19:26:21 -0500 Subject: [PATCH 004/127] Hide channel sidebar label under `more` when setting is enabled (#4678) --- .../components/side-nav-more-options/side-nav-more-options.vue | 1 + 1 file changed, 1 insertion(+) 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 6541150f2..07f17810e 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 @@ -44,6 +44,7 @@ />

- {{ $t("There are no comments available for this video") }} + {{ $t("Comments.There are no comments available for this video") }}

diff --git a/src/renderer/views/Watch/Watch.vue b/src/renderer/views/Watch/Watch.vue index 707090c04..a6d805b05 100644 --- a/src/renderer/views/Watch/Watch.vue +++ b/src/renderer/views/Watch/Watch.vue @@ -87,7 +87,7 @@