From 07dcbd66d4390a80ab17f944a36c07a7d9cd1f74 Mon Sep 17 00:00:00 2001 From: Bnyro <yannick.fehler@web.de> Date: Fri, 22 Jul 2022 18:08:52 +0200 Subject: [PATCH 01/53] responsive navigation bar --- src/App.vue | 4 ++ src/components/NavBar.vue | 80 +++++++++++++++++++++++++++------------ 2 files changed, 59 insertions(+), 25 deletions(-) diff --git a/src/App.vue b/src/App.vue index 357279c3..97a29085 100644 --- a/src/App.vue +++ b/src/App.vue @@ -208,4 +208,8 @@ h2 { .auto .link-secondary { @apply dark:(text-gray-300 hover:(text-gray-400 underline underline-gray-400)); } + +.line { + @apply px-2.5 py-0.25 my-0.45 rounded-xl bg-white; +} </style> diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue index 8888a2e2..8735bc2d 100644 --- a/src/components/NavBar.vue +++ b/src/components/NavBar.vue @@ -26,32 +26,61 @@ @blur="onInputBlur" /> </div> - <div class="flex-1 flex justify-end"> - <ul class="flex text-1xl children:pl-3"> - <li v-if="shouldShowTrending"> - <router-link v-t="'titles.trending'" to="/trending" /> - </li> - <li> - <router-link v-t="'titles.preferences'" to="/preferences" /> - </li> - <li v-if="shouldShowLogin"> - <router-link v-t="'titles.login'" to="/login" /> - </li> - <li v-if="shouldShowLogin"> - <router-link v-t="'titles.register'" to="/register" /> - </li> - <li v-if="shouldShowHistory"> - <router-link v-t="'titles.history'" to="/history" /> - </li> - <li v-if="authenticated"> - <router-link v-t="'titles.playlists'" to="/playlists" /> - </li> - <li v-if="authenticated"> - <router-link v-t="'titles.feed'" to="/feed" /> - </li> - </ul> - </div> + <!-- three vertical lines for toggling the hamburger menu on mobile --> + <button class="md:hidden flex flex-col justify-end mr-3" @click="showTopNav = !showTopNav"> + <span class="line"></span> + <span class="line"></span> + <span class="line"></span> + </button> + <!-- navigation bar for large screen devices --> + <ul class="hidden md:(flex-1 flex justify-end flex text-1xl children:pl-3)"> + <li v-if="shouldShowTrending"> + <router-link v-t="'titles.trending'" to="/trending" /> + </li> + <li> + <router-link v-t="'titles.preferences'" to="/preferences" /> + </li> + <li v-if="shouldShowLogin"> + <router-link v-t="'titles.login'" to="/login" /> + </li> + <li v-if="shouldShowLogin"> + <router-link v-t="'titles.register'" to="/register" /> + </li> + <li v-if="shouldShowHistory"> + <router-link v-t="'titles.history'" to="/history" /> + </li> + <li v-if="authenticated"> + <router-link v-t="'titles.playlists'" to="/playlists" /> + </li> + <li v-if="authenticated && !shouldShowTrending"> + <router-link v-t="'titles.feed'" to="/feed" /> + </li> + </ul> </nav> + <!-- navigation bar for mobile devices --> + <ul v-if="showTopNav" class="flex flex-col justify-center items-end mb-4 children:(my-0.5 mr-5)"> + <li v-if="shouldShowTrending"> + <router-link v-t="'titles.trending'" to="/trending" /> + </li> + <li> + <router-link v-t="'titles.preferences'" to="/preferences" /> + </li> + <li v-if="shouldShowLogin"> + <router-link v-t="'titles.login'" to="/login" /> + </li> + <li v-if="shouldShowLogin"> + <router-link v-t="'titles.register'" to="/register" /> + </li> + <li v-if="shouldShowHistory"> + <router-link v-t="'titles.history'" to="/history" /> + </li> + <li v-if="authenticated"> + <router-link v-t="'titles.playlists'" to="/playlists" /> + </li> + <li v-if="authenticated && !shouldShowTrending"> + <router-link v-t="'titles.feed'" to="/feed" /> + </li> + </ul> <div class="w-full md:hidden"> <input v-model="searchText" @@ -85,6 +114,7 @@ export default { return { searchText: "", suggestionsVisible: false, + showTopNav: false, }; }, mounted() { From 9033980e7960789fd9f29a74481da0e2c6d18088 Mon Sep 17 00:00:00 2001 From: Bnyro <yannick.fehler@web.de> Date: Fri, 22 Jul 2022 18:49:27 +0200 Subject: [PATCH 02/53] small fixes --- src/components/NavBar.vue | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue index 8735bc2d..aa3707df 100644 --- a/src/components/NavBar.vue +++ b/src/components/NavBar.vue @@ -58,7 +58,11 @@ </ul> </nav> <!-- navigation bar for mobile devices --> - <ul v-if="showTopNav" class="flex flex-col justify-center items-end mb-4 children:(my-0.5 mr-5)"> + <ul + v-if="showTopNav" + class="flex flex-col justify-center items-end mb-4 children:(my-0.5 mr-5)" + @click="showTopNav = false" + > <li v-if="shouldShowTrending"> <router-link v-t="'titles.trending'" to="/trending" /> </li> @@ -81,7 +85,8 @@ <router-link v-t="'titles.feed'" to="/feed" /> </li> </ul> - <div class="w-full md:hidden"> + <!-- search suggestions for mobile devices --> + <div class="w-{full - 4} md:hidden mx-2"> <input v-model="searchText" class="input !h-10 !w-full" From c1a49cce18acc4f408997ec7e0d8362ca5408dbe Mon Sep 17 00:00:00 2001 From: Bnyro <yannick.fehler@web.de> Date: Fri, 22 Jul 2022 19:14:24 +0200 Subject: [PATCH 03/53] fix mobile version of the player view --- src/components/WatchVideo.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/WatchVideo.vue b/src/components/WatchVideo.vue index 96eca506..c9a562c9 100644 --- a/src/components/WatchVideo.vue +++ b/src/components/WatchVideo.vue @@ -74,7 +74,7 @@ <!-- Verified Badge --> <font-awesome-icon class="ml-1" v-if="video.uploaderVerified" icon="check" /> </div> - <div class="relative ml-auto children:mx-2"> + <div class="flex relative ml-auto children:mx-1"> <button class="btn" v-if="authenticated" @click="showModal = !showModal"> {{ $t("actions.add_to_playlist") }}<font-awesome-icon class="ml-1" icon="circle-plus" /> </button> @@ -89,8 +89,8 @@ /> </div> <PlaylistAddModal v-if="showModal" :video-id="getVideoId()" @close="showModal = !showModal" /> - <div class="flex <lg:basis-7/12"> - <div class="self-center children:mr-1"> + <div class="flex"> + <div class="self-center children:mr-1 my-1"> <!-- RSS Feed button --> <a aria-label="RSS feed" @@ -112,7 +112,7 @@ </i18n-t> </a> <!-- only visible on small screens --> - <a :href="`https://youtu.be/${getVideoId()}`" class="btn sm:hidden"> + <a :href="`https://youtu.be/${getVideoId()}`" class="btn lg:hidden"> <font-awesome-icon class="mx-1.5" :icon="['fab', 'youtube']" /> </a> <!-- LBRY --> From adead97b23f754b7357b68cdceac477af71f2cf1 Mon Sep 17 00:00:00 2001 From: Bnyro <yannick.fehler@web.de> Date: Fri, 22 Jul 2022 20:50:21 +0200 Subject: [PATCH 04/53] fix crash on chapters --- src/components/ChaptersBar.vue | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/src/components/ChaptersBar.vue b/src/components/ChaptersBar.vue index ca57f195..ab8b9dd5 100644 --- a/src/components/ChaptersBar.vue +++ b/src/components/ChaptersBar.vue @@ -10,7 +10,7 @@ @click="$emit('seek', chapter.start)" class="chapter-vertical" :class=" - playerPosition >= chapter.start && playerPosition < chapters[index + 1].start + isCurrentChapter(chapters, index, playerPosition) ? 'chapter-vertical bg-red-500/50' : 'chapter-vertical' " @@ -29,13 +29,9 @@ <div v-else class="flex overflow-x-auto"> <div :key="chapter.start" - v-for="(chapter, index) in chapters" + v-for="chapter in chapters" @click="$emit('seek', chapter.start)" - :class=" - playerPosition >= chapter.start && playerPosition < chapters[index + 1].start - ? 'chapter bg-red-500/50' - : 'chapter' - " + :class="isCurrentChapter(chapters, index, playerPosition) ? 'chapter bg-red-500/50' : 'chapter'" > <img :src="chapter.image" :alt="chapter.title" /> <div class="m-1 flex"> @@ -70,6 +66,19 @@ } </style> +<script> +export default { + methods: { + isCurrentChapter(chapters, index, playerPosition) { + if (index + 1 === chapters.length && playerPosition >= chapters[index].start) return true; + else if (index + 1 === chapters.length) return false; + else if (playerPosition >= chapters[index].start && playerPosition < chapters[index + 1].start) return true; + return false; + }, + }, +}; +</script> + <script setup> import { defineProps, defineEmits } from "vue"; From ded13b14c9dac1684b95342dc1f796d251cfa00c Mon Sep 17 00:00:00 2001 From: Bnyro <yannick.fehler@web.de> Date: Fri, 22 Jul 2022 20:52:35 +0200 Subject: [PATCH 05/53] fix syntax --- src/components/ChaptersBar.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/components/ChaptersBar.vue b/src/components/ChaptersBar.vue index ab8b9dd5..19bdbacd 100644 --- a/src/components/ChaptersBar.vue +++ b/src/components/ChaptersBar.vue @@ -70,9 +70,11 @@ export default { methods: { isCurrentChapter(chapters, index, playerPosition) { - if (index + 1 === chapters.length && playerPosition >= chapters[index].start) return true; - else if (index + 1 === chapters.length) return false; - else if (playerPosition >= chapters[index].start && playerPosition < chapters[index + 1].start) return true; + if (index + 1 == chapters.length) { + if (playerPosition >= chapters[index].start) return true; + else return false; + } else if (playerPosition >= chapters[index].start && playerPosition < chapters[index + 1].start) + return true; return false; }, }, From 6f0897a263c70857c402d603c96470e5336b301c Mon Sep 17 00:00:00 2001 From: Bnyro <yannick.fehler@web.de> Date: Fri, 22 Jul 2022 20:54:52 +0200 Subject: [PATCH 06/53] fix mobile --- src/components/ChaptersBar.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ChaptersBar.vue b/src/components/ChaptersBar.vue index 19bdbacd..5679813d 100644 --- a/src/components/ChaptersBar.vue +++ b/src/components/ChaptersBar.vue @@ -29,7 +29,7 @@ <div v-else class="flex overflow-x-auto"> <div :key="chapter.start" - v-for="chapter in chapters" + v-for="(chapter, index) in chapters" @click="$emit('seek', chapter.start)" :class="isCurrentChapter(chapters, index, playerPosition) ? 'chapter bg-red-500/50' : 'chapter'" > From e68e73794e3f1f68572040ed2c352f4f23ed25bb Mon Sep 17 00:00:00 2001 From: Bnyro <yannick.fehler@web.de> Date: Sat, 23 Jul 2022 14:40:16 +0200 Subject: [PATCH 07/53] fix bad syntax --- src/components/ChaptersBar.vue | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/components/ChaptersBar.vue b/src/components/ChaptersBar.vue index 5679813d..d777c74e 100644 --- a/src/components/ChaptersBar.vue +++ b/src/components/ChaptersBar.vue @@ -71,11 +71,10 @@ export default { methods: { isCurrentChapter(chapters, index, playerPosition) { if (index + 1 == chapters.length) { - if (playerPosition >= chapters[index].start) return true; - else return false; - } else if (playerPosition >= chapters[index].start && playerPosition < chapters[index + 1].start) - return true; - return false; + return playerPosition >= chapters[index].start; + } else { + return playerPosition >= chapters[index].start && playerPosition < chapters[index + 1].start; + } }, }, }; From b8bbf49158eb7cbb6ecf70a4600702c18afd1da9 Mon Sep 17 00:00:00 2001 From: Bnyro <yannick.fehler@web.de> Date: Sat, 23 Jul 2022 18:15:40 +0200 Subject: [PATCH 08/53] improve captions style --- src/components/VideoPlayer.vue | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/components/VideoPlayer.vue b/src/components/VideoPlayer.vue index a1a2c79f..247790ff 100644 --- a/src/components/VideoPlayer.vue +++ b/src/components/VideoPlayer.vue @@ -652,4 +652,19 @@ export default { .shaka-video-container:-webkit-full-screen { max-height: none !important; } + +/* captions style */ +.shaka-text-wrapper * { + text-align: left !important; +} + +.shaka-text-wrapper > span > span { + background-color: transparent !important; +} + +/* apply to all spans that don't include multiple other spans to avoid the style being applied to the text container too when the subtitles are two lines */ +.shaka-text-wrapper > span > span *:first-child:last-child { + background-color: rgba(0, 0, 0, 0.6) !important; + padding: 0.09em 0; +} </style> From 4361cb905931500ec6a24c283437b75b7bbcdffb Mon Sep 17 00:00:00 2001 From: Bnyro <82752168+Bnyro@users.noreply.github.com> Date: Sat, 23 Jul 2022 22:21:56 +0200 Subject: [PATCH 09/53] Create config.yml --- .github/ISSUE_TEMPLATE/config.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/ISSUE_TEMPLATE/config.yml diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 00000000..3ba13e0c --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1 @@ +blank_issues_enabled: false From 4a46122415a43e4c646ea08bb9a48406cc45f4e0 Mon Sep 17 00:00:00 2001 From: Bnyro <82752168+Bnyro@users.noreply.github.com> Date: Sat, 23 Jul 2022 22:28:11 +0200 Subject: [PATCH 10/53] Create question.yml --- .github/ISSUE_TEMPLATE/question.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/question.yml diff --git a/.github/ISSUE_TEMPLATE/question.yml b/.github/ISSUE_TEMPLATE/question.yml new file mode 100644 index 00000000..a77ce23f --- /dev/null +++ b/.github/ISSUE_TEMPLATE/question.yml @@ -0,0 +1,16 @@ +name: Question +description: Ask questions about configuration and usage of Piped. +labels: [question] +body: + - type: markdown + attributes: + value: | + Please make sure to read the README.md before posting a question or asking for support. + + - type: textarea + id: question + attributes: + label: Describe your question + description: A clear description of what your doubt is. + validations: + required: true From a1ea86dd7b0aa786174e1ac9b08a8bbfbe4822b7 Mon Sep 17 00:00:00 2001 From: privacytime101 <109485589+privacytime101@users.noreply.github.com> Date: Sun, 24 Jul 2022 00:24:41 -0700 Subject: [PATCH 11/53] Update ar.json --- src/locales/ar.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/ar.json b/src/locales/ar.json index 2ba3d154..85d9a69d 100644 --- a/src/locales/ar.json +++ b/src/locales/ar.json @@ -64,7 +64,7 @@ "language_selection": "اختيار اللغة", "instances_list": "قائمة المثيلات", "enabled_codecs": "برامج الترميز الممكنة (متعددة)", - "import_from_json": "استيراد من JSON", + "import_from_json": "استيراد من JSON/CSV", "loop_this_video": "تكرار هذا الفيديو", "auto_play_next_video": "التشغيل التلقائي للفيديو التالي", "donations": "التبرعات", From 9b9e26e1f8ea45bd51f1fd46d6fd915745fd7f71 Mon Sep 17 00:00:00 2001 From: privacytime101 <109485589+privacytime101@users.noreply.github.com> Date: Sun, 24 Jul 2022 00:25:04 -0700 Subject: [PATCH 12/53] Update az.json --- src/locales/az.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/az.json b/src/locales/az.json index 05b382dc..02fc3b18 100644 --- a/src/locales/az.json +++ b/src/locales/az.json @@ -42,7 +42,7 @@ "default_quality": "Defolt Keyfiyyət", "buffering_goal": "Tamponlama Məqsədi (saniyələrlə)", "export_to_json": "JSON-a İxrac Edin", - "import_from_json": "JSON-dan İdxal Edin", + "import_from_json": "JSON/CSV-dan İdxal Edin", "loop_this_video": "Bu Videonu Təkrarla", "auto_play_next_video": "Növbəti Videonu Avto-Oynat", "donations": "İanələr", From 25fedd7681614c5a9a9cbb1e29fdf2e752515141 Mon Sep 17 00:00:00 2001 From: privacytime101 <109485589+privacytime101@users.noreply.github.com> Date: Sun, 24 Jul 2022 00:26:26 -0700 Subject: [PATCH 13/53] Update bn.json --- src/locales/bn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/bn.json b/src/locales/bn.json index c3acc3fc..9d50f390 100644 --- a/src/locales/bn.json +++ b/src/locales/bn.json @@ -53,7 +53,7 @@ "yes": "হ্যাঁ", "no": "না", "export_to_json": "JSON ফাইলে সংরক্ষণ করুন", - "import_from_json": "JSON ফাইল থেকে আনুন", + "import_from_json": "JSON/CSV ফাইল থেকে আনুন", "loop_this_video": "ভিডিওটি চক্রের মধ্যে রাখুন", "instance_selection": "সঙ্ঘটন নির্বাচন", "show_more": "আরো দেখুন", From 1f4c1ea839a6ceadceb56e1fe860ba58b4edaa80 Mon Sep 17 00:00:00 2001 From: privacytime101 <109485589+privacytime101@users.noreply.github.com> Date: Sun, 24 Jul 2022 00:26:55 -0700 Subject: [PATCH 14/53] Update bs.json --- src/locales/bs.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/bs.json b/src/locales/bs.json index 21bb3b48..5584febc 100644 --- a/src/locales/bs.json +++ b/src/locales/bs.json @@ -56,7 +56,7 @@ "show_more": "Prikaži više", "yes": "Da", "export_to_json": "Izvezi u JSON", - "import_from_json": "Uvezi iz JSON-a", + "import_from_json": "Uvezi iz JSON/CSV-a", "minimize_description": "Umanji opis", "minimize_recommendations": "Umanjite preporuke", "clear_history": "Obrišite historiju", From c453c76642c96b3a19939b630900e0ce527de7df Mon Sep 17 00:00:00 2001 From: privacytime101 <109485589+privacytime101@users.noreply.github.com> Date: Sun, 24 Jul 2022 00:27:15 -0700 Subject: [PATCH 15/53] Update ca.json --- src/locales/ca.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/ca.json b/src/locales/ca.json index 41004fa7..2a955b6e 100644 --- a/src/locales/ca.json +++ b/src/locales/ca.json @@ -41,7 +41,7 @@ "yes": "Sí", "no": "No", "export_to_json": "Exportar a JSON", - "import_from_json": "Importar de JSON", + "import_from_json": "Importar de JSON/CSV", "loop_this_video": "Reprodueix aquest Vídeo en bucle", "donations": "Donacions", "minimize_description": "Minimitza la Descripció", From 715546aa4bdc636abcff1d0ae50a1423cdb441aa Mon Sep 17 00:00:00 2001 From: privacytime101 <109485589+privacytime101@users.noreply.github.com> Date: Sun, 24 Jul 2022 00:27:44 -0700 Subject: [PATCH 16/53] Update cs.json --- src/locales/cs.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/cs.json b/src/locales/cs.json index d02773cb..c9575e55 100644 --- a/src/locales/cs.json +++ b/src/locales/cs.json @@ -43,7 +43,7 @@ "yes": "Ano", "no": "Ne", "export_to_json": "Exportovat do JSON", - "import_from_json": "Importovat z JSON", + "import_from_json": "Importovat z JSON/CSV", "auto_play_next_video": "Automaticky přehrát další video", "donations": "Darovat", "show_description": "Zobrazit popis", From 685337aeacc86f3807aa18b917fdcf3b3d0e6951 Mon Sep 17 00:00:00 2001 From: privacytime101 <109485589+privacytime101@users.noreply.github.com> Date: Sun, 24 Jul 2022 00:28:19 -0700 Subject: [PATCH 17/53] Update da.json --- src/locales/da.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/da.json b/src/locales/da.json index 97d06d7b..7b15c330 100644 --- a/src/locales/da.json +++ b/src/locales/da.json @@ -52,7 +52,7 @@ "show_more": "Vis mere", "yes": "Ja", "no": "Nej", - "import_from_json": "Importer fra JSON", + "import_from_json": "Importer fra JSON/CSV", "loop_this_video": "Gentag denne video", "auto_play_next_video": "Afspil næste video automatisk", "donations": "Donationer", From b25308f15dc3a5439b7bd0bdf865e6f5e73d694b Mon Sep 17 00:00:00 2001 From: privacytime101 <109485589+privacytime101@users.noreply.github.com> Date: Sun, 24 Jul 2022 00:28:46 -0700 Subject: [PATCH 18/53] Update de.json --- src/locales/de.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/de.json b/src/locales/de.json index 90e1bea9..81fcf5c4 100644 --- a/src/locales/de.json +++ b/src/locales/de.json @@ -44,7 +44,7 @@ "donations": "Spenden", "auto_play_next_video": "Nächstes Video automatisch abspielen", "loop_this_video": "Dieses Video wiederholen", - "import_from_json": "Aus JSON importieren", + "import_from_json": "Aus JSON/CSV importieren", "export_to_json": "Als JSON exportieren", "show_more": "Mehr anzeigen", "no": "Nein", From 0beddb79d5b311233aa2e507d87c3eb480d0e10d Mon Sep 17 00:00:00 2001 From: privacytime101 <109485589+privacytime101@users.noreply.github.com> Date: Sun, 24 Jul 2022 00:29:02 -0700 Subject: [PATCH 19/53] Update el.json --- src/locales/el.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/el.json b/src/locales/el.json index c01feed8..24d3294d 100644 --- a/src/locales/el.json +++ b/src/locales/el.json @@ -44,7 +44,7 @@ "show_recommendations": "Εμφάνιση συστάσεις", "donations": "Δωρεές", "auto_play_next_video": "Αυτόματη αναπαραγωγή επόμενου βίντεο", - "import_from_json": "Εισαγωγή από JSON", + "import_from_json": "Εισαγωγή από JSON/CSV", "export_to_json": "Εξαγωγή σε JSON", "no": "Όχι", "yes": "Ναι", From eed6d031f7c1650e67930b64d4f0994abd217ba1 Mon Sep 17 00:00:00 2001 From: privacytime101 <109485589+privacytime101@users.noreply.github.com> Date: Sun, 24 Jul 2022 00:29:21 -0700 Subject: [PATCH 20/53] Update en.json --- src/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/en.json b/src/locales/en.json index bae35a00..e81f48c4 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -55,7 +55,7 @@ "yes": "Yes", "no": "No", "export_to_json": "Export to JSON", - "import_from_json": "Import from JSON", + "import_from_json": "Import from JSON/CSV", "loop_this_video": "Loop this Video", "auto_play_next_video": "Auto Play next Video", "donations": "Donations", From a6185c72511ac534d9230ec7286d900517eaf8a3 Mon Sep 17 00:00:00 2001 From: privacytime101 <109485589+privacytime101@users.noreply.github.com> Date: Sun, 24 Jul 2022 00:30:15 -0700 Subject: [PATCH 21/53] Update es.json --- src/locales/es.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/es.json b/src/locales/es.json index 16c6e21a..2cc6d59f 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -29,7 +29,7 @@ "donations": "Donaciones", "auto_play_next_video": "Reproducción automática del siguiente vídeo", "loop_this_video": "Poner en bucle este vídeo", - "import_from_json": "Importar desde JSON", + "import_from_json": "Importar desde JSON/CSV", "export_to_json": "Exportar a JSON", "no": "No", "yes": "Sí", From 8dfc41a32506a31d4ceae45041699c210319bb86 Mon Sep 17 00:00:00 2001 From: privacytime101 <109485589+privacytime101@users.noreply.github.com> Date: Sun, 24 Jul 2022 00:30:40 -0700 Subject: [PATCH 22/53] Update et.json --- src/locales/et.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/et.json b/src/locales/et.json index 3361ff09..343c55c7 100644 --- a/src/locales/et.json +++ b/src/locales/et.json @@ -39,7 +39,7 @@ "yes": "Jah", "no": "Ei", "export_to_json": "Eksportida JSON-vormingusse", - "import_from_json": "Importimine JSONist", + "import_from_json": "Importimine JSON/CSVist", "loop_this_video": "Selle video pidev taasesitus", "donations": "Annetused", "minimize_description": "Minimeeri kirjeldus", From 3e4bdf6f5e8b627a788b62975c1a45b8f8399ec2 Mon Sep 17 00:00:00 2001 From: privacytime101 <109485589+privacytime101@users.noreply.github.com> Date: Sun, 24 Jul 2022 00:30:58 -0700 Subject: [PATCH 23/53] Update eu.json --- src/locales/eu.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/eu.json b/src/locales/eu.json index 24aa7896..d65abd75 100644 --- a/src/locales/eu.json +++ b/src/locales/eu.json @@ -22,7 +22,7 @@ "donations": "Dohaintzak", "auto_play_next_video": "Hurrengo bideoa automatikoki erreproduzitu", "loop_this_video": "Bideo hau begiztan jarri", - "import_from_json": "Inportatu JSONetik", + "import_from_json": "Inportatu JSON/CSVetik", "export_to_json": "Esportatu JSONera", "no": "Ez", "yes": "Bai", From 4f4a7406146e8ed6ca8b674685ded4c89a2a241d Mon Sep 17 00:00:00 2001 From: privacytime101 <109485589+privacytime101@users.noreply.github.com> Date: Sun, 24 Jul 2022 00:31:19 -0700 Subject: [PATCH 24/53] Update fa.json --- src/locales/fa.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/fa.json b/src/locales/fa.json index 95d7921c..ec7d9e6e 100644 --- a/src/locales/fa.json +++ b/src/locales/fa.json @@ -42,7 +42,7 @@ "skip_interaction": "رد کردن یاداوری سابسکرایب", "skip_highlight": "رد کردن نکات برجسته", "skip_filler_tangent": "رد کردن چرندیات نامربوط", - "import_from_json": "وارد کردن از JSON", + "import_from_json": "وارد کردن از JSON/CSV", "export_to_json": "دادن خروجی با فرمت JSON", "show_description": "نمایش توضیحات ویدئو", "donations": "کمک های مالی", From e01665feee4950015cf6b3c504bd7a75829ca6f6 Mon Sep 17 00:00:00 2001 From: privacytime101 <109485589+privacytime101@users.noreply.github.com> Date: Sun, 24 Jul 2022 00:31:43 -0700 Subject: [PATCH 25/53] Update fi.json --- src/locales/fi.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/fi.json b/src/locales/fi.json index 882cbaab..106f667d 100644 --- a/src/locales/fi.json +++ b/src/locales/fi.json @@ -74,7 +74,7 @@ "skip_preview": "Ohita esikatselu/toistelu", "export_to_json": "Vie JSON-muotoon", "remove_from_playlist": "Poista soittolistalta", - "import_from_json": "Tuo JSON:sta", + "import_from_json": "Tuo JSON/CSV:sta", "delete_playlist": "Poista soittolista", "create_playlist": "Luo soittolista", "select_playlist": "Valitse soittolista", From b7427193cb8ad695c71bf7785bb4e8c0894bbe26 Mon Sep 17 00:00:00 2001 From: privacytime101 <109485589+privacytime101@users.noreply.github.com> Date: Sun, 24 Jul 2022 00:32:00 -0700 Subject: [PATCH 26/53] Update fr.json --- src/locales/fr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/fr.json b/src/locales/fr.json index d52dd474..2f9267c5 100644 --- a/src/locales/fr.json +++ b/src/locales/fr.json @@ -50,7 +50,7 @@ "donations": "Dons", "auto_play_next_video": "Lire la vidéo suivante automatiquement", "loop_this_video": "Mettre cette vidéo en boucle", - "import_from_json": "Importer depuis le format JSON", + "import_from_json": "Importer depuis le format JSON/CSV", "export_to_json": "Exporter en JSON", "show_more": "Afficher plus", "instance_selection": "Sélection de l'instance", From 225776e61baa1f84a920ba008783ac47b2a7a693 Mon Sep 17 00:00:00 2001 From: privacytime101 <109485589+privacytime101@users.noreply.github.com> Date: Sun, 24 Jul 2022 00:32:21 -0700 Subject: [PATCH 27/53] Update hi.json --- src/locales/hi.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/hi.json b/src/locales/hi.json index 3be964a8..e60c22fd 100644 --- a/src/locales/hi.json +++ b/src/locales/hi.json @@ -45,7 +45,7 @@ "instance_selection": "इंस्टेंस चयन", "show_more": "और दिखाओ", "export_to_json": "JSON में निर्यात करें", - "import_from_json": "JSON से आयात करें", + "import_from_json": "JSON/CSV से आयात करें", "auto_play_next_video": "अगला वीडियो ऑटोप्ले करें", "donations": "दान", "minimize_recommendations": "सिफारिशों को कम करें", From f0055b891a62d7af112710d8de6c428ba7500b49 Mon Sep 17 00:00:00 2001 From: privacytime101 <109485589+privacytime101@users.noreply.github.com> Date: Sun, 24 Jul 2022 00:32:45 -0700 Subject: [PATCH 28/53] Update hr.json --- src/locales/hr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/hr.json b/src/locales/hr.json index 0596839a..f786b103 100644 --- a/src/locales/hr.json +++ b/src/locales/hr.json @@ -32,7 +32,7 @@ "donations": "Donacije", "auto_play_next_video": "Automatski reproduciraj idući video", "loop_this_video": "Ponavljaj ovaj video", - "import_from_json": "Uvezi iz JSON formata", + "import_from_json": "Uvezi iz JSON/CSV formata", "export_to_json": "Izvezi u JSON", "no": "Ne", "yes": "Da", From 75daa413fcac0dd87613db26ed1bf54aa06caea5 Mon Sep 17 00:00:00 2001 From: privacytime101 <109485589+privacytime101@users.noreply.github.com> Date: Sun, 24 Jul 2022 00:33:04 -0700 Subject: [PATCH 29/53] Update hu.json --- src/locales/hu.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/hu.json b/src/locales/hu.json index c3c7c1c9..cc385d8e 100644 --- a/src/locales/hu.json +++ b/src/locales/hu.json @@ -71,7 +71,7 @@ "view_ssl_score": "SSL pontszám megtekintése", "sort_by": "Rendezés:", "show_description": "Leírás megjelenítése", - "import_from_json": "Importálás JSON-ból", + "import_from_json": "Importálás JSON/CSV-ból", "delete_playlist_video_confirm": "Biztosan szeretnéd törölni ezt a videót a lejátszási listából?", "remove_from_playlist": "Törlés lejátszási listából", "auto_play_next_video": "Következő videó automatikus lejátszása", From 76bdf6e3aaf57a51316c2142144f526857e48f54 Mon Sep 17 00:00:00 2001 From: privacytime101 <109485589+privacytime101@users.noreply.github.com> Date: Sun, 24 Jul 2022 00:33:24 -0700 Subject: [PATCH 30/53] Update id.json --- src/locales/id.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/id.json b/src/locales/id.json index 81792e41..b97e1f5b 100644 --- a/src/locales/id.json +++ b/src/locales/id.json @@ -47,7 +47,7 @@ "show_more": "Tampilkan Lebih Banyak", "yes": "Iya", "no": "Tidak", - "import_from_json": "Impor dari JSON", + "import_from_json": "Impor dari JSON/CSV", "loop_this_video": "Ulangi Video ini", "auto_play_next_video": "Mainkan video berikutnya secara otomatis", "donations": "Donasi", From d4133fed1c45bfe18cfc8d058d491593d40b8d58 Mon Sep 17 00:00:00 2001 From: privacytime101 <109485589+privacytime101@users.noreply.github.com> Date: Sun, 24 Jul 2022 00:33:42 -0700 Subject: [PATCH 31/53] Update is.json --- src/locales/is.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/is.json b/src/locales/is.json index 93a3176e..a53a06bc 100644 --- a/src/locales/is.json +++ b/src/locales/is.json @@ -54,7 +54,7 @@ "view_ssl_score": "Skoðaðu SSL Einkunn", "enabled_codecs": "Virkjir Afkóðarar (Marghæft)", "instance_selection": "Tilviksval", - "import_from_json": "Flytja inn frá JSON", + "import_from_json": "Flytja inn frá JSON/CSV", "loop_this_video": "Endurtaka þetta Myndband", "auto_play_next_video": "Spila Næsta Myndband Sjálfvirkt", "filter": "Sía", From 357d785e87737d6ef883d28734b552634c4ba196 Mon Sep 17 00:00:00 2001 From: privacytime101 <109485589+privacytime101@users.noreply.github.com> Date: Sun, 24 Jul 2022 00:34:03 -0700 Subject: [PATCH 32/53] Update it.json --- src/locales/it.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/it.json b/src/locales/it.json index 275690a9..7c4c78d8 100644 --- a/src/locales/it.json +++ b/src/locales/it.json @@ -43,7 +43,7 @@ "donations": "Donazioni", "auto_play_next_video": "Riproduci automaticamente il prossimo video", "loop_this_video": "Ripeti questo video", - "import_from_json": "Importa da JSON", + "import_from_json": "Importa da JSON/CSV", "export_to_json": "Esporta in JSON", "no": "No", "yes": "Sì", From d8a74105b085515eef806550f4a967add46064c9 Mon Sep 17 00:00:00 2001 From: privacytime101 <109485589+privacytime101@users.noreply.github.com> Date: Sun, 24 Jul 2022 00:34:24 -0700 Subject: [PATCH 33/53] Update ja.json --- src/locales/ja.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/ja.json b/src/locales/ja.json index 6e052959..76c905ad 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -52,7 +52,7 @@ "yes": "はい", "no": "いいえ", "export_to_json": "JSONファイルに出力", - "import_from_json": "JSONファイルを読み込む", + "import_from_json": "JSON/CSVファイルを読み込む", "loop_this_video": "ループ再生", "auto_play_next_video": "自動再生", "donations": "寄付", From 83f07b9452c58f8393c8dfc276a13ab8f1114680 Mon Sep 17 00:00:00 2001 From: privacytime101 <109485589+privacytime101@users.noreply.github.com> Date: Sun, 24 Jul 2022 00:34:49 -0700 Subject: [PATCH 34/53] Update ko.json --- src/locales/ko.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/ko.json b/src/locales/ko.json index 68fe90d4..9f36d7d2 100644 --- a/src/locales/ko.json +++ b/src/locales/ko.json @@ -38,7 +38,7 @@ "minimize_description_default": "기본적으로 설명 최소화", "enabled_codecs": "활성화된 코덱 (여러 개)", "instance_selection": "인스턴스 선택", - "import_from_json": "JSON에서 가져오기", + "import_from_json": "JSON/CSV에서 가져오기", "light": "라이트", "autoplay_video": "영상 자동 재생", "default_quality": "기본 화질", From 5b6d3df41113dac8c1f8b0aaf15110423e9e2fbd Mon Sep 17 00:00:00 2001 From: privacytime101 <109485589+privacytime101@users.noreply.github.com> Date: Sun, 24 Jul 2022 00:35:08 -0700 Subject: [PATCH 35/53] Update lt.json --- src/locales/lt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/lt.json b/src/locales/lt.json index 65ad1b1c..dc93c8c1 100644 --- a/src/locales/lt.json +++ b/src/locales/lt.json @@ -44,7 +44,7 @@ "minimize_description": "Suskleisti aprašymą", "minimize_recommendations": "Suskleisti rekomendacijas", "show_recommendations": "Rodyti rekomendacijas", - "import_from_json": "Importuoti iš JSON", + "import_from_json": "Importuoti iš JSON/CSV", "export_to_json": "Eksportuoti į JSON", "no": "Ne", "yes": "Taip", From d28b25feadcdff5faae31ae9c35be07b9ec10924 Mon Sep 17 00:00:00 2001 From: privacytime101 <109485589+privacytime101@users.noreply.github.com> Date: Sun, 24 Jul 2022 00:35:23 -0700 Subject: [PATCH 36/53] Update ml.json --- src/locales/ml.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/ml.json b/src/locales/ml.json index b1e89075..79e5f754 100644 --- a/src/locales/ml.json +++ b/src/locales/ml.json @@ -54,7 +54,7 @@ "yes": "അതെ", "show_more": "കൂടുതൽ കാണിക്കുക", "buffering_goal": "ബഫറിംഗ് ലക്ഷ്യം(സെക്കൻഡുകളിൽ)", - "import_from_json": "JSON നിന്ന് ഇറക്കുമതി ചെയ്യൂ", + "import_from_json": "JSON/CSV നിന്ന് ഇറക്കുമതി ചെയ്യൂ", "export_to_json": "JSON-ലേക്ക് എക്സ്പ്പോർട്ട് ചെയ്യുക", "instance_selection": "ഇൻസ്റ്റ്ൻസ് തിരഞ്ഞെടുക്കുക", "loading": "ലഭ്യമാക്കുന്നു...", From cdef6fc48b67938909ca85c19ef0980a5b06c60e Mon Sep 17 00:00:00 2001 From: privacytime101 <109485589+privacytime101@users.noreply.github.com> Date: Sun, 24 Jul 2022 00:35:47 -0700 Subject: [PATCH 37/53] Update nb_NO.json --- src/locales/nb_NO.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/nb_NO.json b/src/locales/nb_NO.json index 069a3e80..0f2649aa 100644 --- a/src/locales/nb_NO.json +++ b/src/locales/nb_NO.json @@ -42,7 +42,7 @@ "donations": "Donasjoner", "auto_play_next_video": "Autospill neste video", "loop_this_video": "Gjenta denne videoen", - "import_from_json": "Importer fra JSON", + "import_from_json": "Importer fra JSON/CSV", "export_to_json": "Eksporter til JSON", "no": "Nei", "yes": "Ja", From 974612bf8249651b25a2220c046e9153cbc95653 Mon Sep 17 00:00:00 2001 From: privacytime101 <109485589+privacytime101@users.noreply.github.com> Date: Sun, 24 Jul 2022 00:36:08 -0700 Subject: [PATCH 38/53] Update nl.json --- src/locales/nl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/nl.json b/src/locales/nl.json index 591bd810..566e2aaf 100644 --- a/src/locales/nl.json +++ b/src/locales/nl.json @@ -60,7 +60,7 @@ "delete_playlist_confirm": "Weet u zeker dat u deze afspeellijst wilt verwijderen?", "please_select_playlist": "Kies een afspeellijst a.u.b.", "instance_selection": "Instantie Selectie", - "import_from_json": "Importeren uit JSON", + "import_from_json": "Importeren uit JSON/CSV", "clear_history": "Geschiedenis Wissen", "show_replies": "Toon Antwoorden", "load_more_replies": "Laad meer Antwoorden", From 525f1dc3dbaaa34d8647bdffe030c095bc582291 Mon Sep 17 00:00:00 2001 From: privacytime101 <109485589+privacytime101@users.noreply.github.com> Date: Sun, 24 Jul 2022 00:36:24 -0700 Subject: [PATCH 39/53] Update pl.json --- src/locales/pl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/pl.json b/src/locales/pl.json index 9e540641..1c475b30 100644 --- a/src/locales/pl.json +++ b/src/locales/pl.json @@ -54,7 +54,7 @@ "yes": "Tak", "no": "Nie", "export_to_json": "Eksport do pliku JSON", - "import_from_json": "Import z pliku JSON", + "import_from_json": "Import z pliku JSON/CSV", "loop_this_video": "Zapętlaj ten film", "auto_play_next_video": "Autoodtwarzanie następnego filmu", "donations": "Wsparcie", From 4451bb7bdaca3076750cca3e326c76474af2d9ce Mon Sep 17 00:00:00 2001 From: privacytime101 <109485589+privacytime101@users.noreply.github.com> Date: Sun, 24 Jul 2022 00:36:42 -0700 Subject: [PATCH 40/53] Update pt.json --- src/locales/pt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/pt.json b/src/locales/pt.json index 4fca6c5a..07427c62 100644 --- a/src/locales/pt.json +++ b/src/locales/pt.json @@ -34,7 +34,7 @@ "enabled_codecs": "Codecs Ativados (Vários)", "instance_selection": "Seleção de Instância", "show_more": "Exibir Mais", - "import_from_json": "Importar de JSON", + "import_from_json": "Importar de JSON/CSV", "export_to_json": "Exportar para JSON", "loop_this_video": "Repetir Este Vídeo", "auto_play_next_video": "Reproduzir o Próximo Vídeo Automaticamente", From cbe67288d5cfc6f8d0dd33cb4b30ac9a82bf6aaa Mon Sep 17 00:00:00 2001 From: privacytime101 <109485589+privacytime101@users.noreply.github.com> Date: Sun, 24 Jul 2022 00:37:00 -0700 Subject: [PATCH 41/53] Update pt_BR.json --- src/locales/pt_BR.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/pt_BR.json b/src/locales/pt_BR.json index 4812f639..8f34a9dc 100644 --- a/src/locales/pt_BR.json +++ b/src/locales/pt_BR.json @@ -55,7 +55,7 @@ "view_ssl_score": "Ver Pontuação SSL", "disable_lbry": "Desabilitar LBRY para Streaming", "enable_lbry_proxy": "Habilitar proxy para LBRY", - "import_from_json": "Importar de JSON", + "import_from_json": "Importar de JSON/CSV", "loop_this_video": "Repetir este Vídeo", "instances_list": "Lista de Instâncias", "clear_history": "Limpar Histórico", From 02b3ac60e14064dadccf05b20d729646b5862a9e Mon Sep 17 00:00:00 2001 From: privacytime101 <109485589+privacytime101@users.noreply.github.com> Date: Sun, 24 Jul 2022 00:37:15 -0700 Subject: [PATCH 42/53] Update pt_PT.json --- src/locales/pt_PT.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/pt_PT.json b/src/locales/pt_PT.json index 03341e7e..d652b275 100644 --- a/src/locales/pt_PT.json +++ b/src/locales/pt_PT.json @@ -40,7 +40,7 @@ "enabled_codecs": "Codecs ativados (vários)", "instance_selection": "Seleção de instância", "show_more": "Mostrar mais", - "import_from_json": "Importar de JSON", + "import_from_json": "Importar de JSON/CSV", "loop_this_video": "Repetir este vídeo", "auto_play_next_video": "Reproduzir o próximo vídeo automaticamente", "donations": "Doações", From 1b5e5da40b4d7ebdfa4b0297d742bed33e5645f5 Mon Sep 17 00:00:00 2001 From: privacytime101 <109485589+privacytime101@users.noreply.github.com> Date: Sun, 24 Jul 2022 00:37:39 -0700 Subject: [PATCH 43/53] Update ru.json --- src/locales/ru.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/ru.json b/src/locales/ru.json index e7f58438..f6ae79e4 100644 --- a/src/locales/ru.json +++ b/src/locales/ru.json @@ -52,7 +52,7 @@ "yes": "Да", "no": "Нет", "export_to_json": "Экспорт в JSON", - "import_from_json": "Импорт из JSON", + "import_from_json": "Импорт из JSON/CSV", "loop_this_video": "Повтор текущего видео", "auto_play_next_video": "Сразу проигрывать следующее рекомендованное видео", "donations": "Пожертвования", From c46abd2a96d763c94ea2432ed898d08c454586e6 Mon Sep 17 00:00:00 2001 From: privacytime101 <109485589+privacytime101@users.noreply.github.com> Date: Sun, 24 Jul 2022 00:37:59 -0700 Subject: [PATCH 44/53] Update sk.json --- src/locales/sk.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/sk.json b/src/locales/sk.json index df74ab50..db20b3dd 100644 --- a/src/locales/sk.json +++ b/src/locales/sk.json @@ -45,7 +45,7 @@ "show_more": "Ukázať viac", "yes": "Áno", "no": "Nie", - "import_from_json": "Importovať z JSONu", + "import_from_json": "Importovať z JSON/CSVu", "loop_this_video": "Opakovať", "auto_play_next_video": "Automaticky prehrávať ďalšie video", "donations": "Dary", From f30acc78dd7e42412057af586f5a04f8dc2b3ed7 Mon Sep 17 00:00:00 2001 From: privacytime101 <109485589+privacytime101@users.noreply.github.com> Date: Sun, 24 Jul 2022 00:38:17 -0700 Subject: [PATCH 45/53] Update sr.json --- src/locales/sr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/sr.json b/src/locales/sr.json index 961f1abb..f7ecaced 100644 --- a/src/locales/sr.json +++ b/src/locales/sr.json @@ -57,7 +57,7 @@ "show_more": "Прикажи више", "yes": "Да", "export_to_json": "Извези у JSON", - "import_from_json": "Увези из JSON-а", + "import_from_json": "Увези из JSON/CSV-а", "minimize_recommendations": "Смањи препоруке", "disable_lbry": "Онемогући LBRY за стримовање", "enable_lbry_proxy": "Омогући прокси за LBRY", From f46dd4d6697ecd4a7cf6cd25056025a8d1b0db7a Mon Sep 17 00:00:00 2001 From: privacytime101 <109485589+privacytime101@users.noreply.github.com> Date: Sun, 24 Jul 2022 00:38:36 -0700 Subject: [PATCH 46/53] Update sv.json --- src/locales/sv.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/sv.json b/src/locales/sv.json index c5c1dd41..207e05b4 100644 --- a/src/locales/sv.json +++ b/src/locales/sv.json @@ -43,7 +43,7 @@ "store_watch_history": "Spara titthistorik", "instances_list": "Lista över instanser", "enabled_codecs": "Aktivera codecs (flera)", - "import_from_json": "Importera från JSON", + "import_from_json": "Importera från JSON/CSV", "donations": "Donationer", "filter": "Filter", "hide_replies": "Dölj svar", From bcb6df269165ca99ef998e0808327af9b2c3edcb Mon Sep 17 00:00:00 2001 From: privacytime101 <109485589+privacytime101@users.noreply.github.com> Date: Sun, 24 Jul 2022 00:39:34 -0700 Subject: [PATCH 47/53] Update tr.json --- src/locales/tr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/tr.json b/src/locales/tr.json index 308e5252..d84d47b7 100644 --- a/src/locales/tr.json +++ b/src/locales/tr.json @@ -41,7 +41,7 @@ "donations": "Bağışlar", "auto_play_next_video": "Sonraki Videoyu Otomatik Oynat", "loop_this_video": "Bu Videoyu Döngüye Al", - "import_from_json": "JSON dosyasından içe aktar", + "import_from_json": "JSON/CSV dosyasından içe aktar", "export_to_json": "JSON Olarak Dışa Aktar", "no": "Hayır", "yes": "Evet", From f61e2c11ae354680fc6b79a79e30bdb70530f8b8 Mon Sep 17 00:00:00 2001 From: privacytime101 <109485589+privacytime101@users.noreply.github.com> Date: Sun, 24 Jul 2022 00:39:54 -0700 Subject: [PATCH 48/53] Update uk.json --- src/locales/uk.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/uk.json b/src/locales/uk.json index b7923202..ba286b8f 100644 --- a/src/locales/uk.json +++ b/src/locales/uk.json @@ -54,7 +54,7 @@ "country_selection": "Вибір країни (для трендів)", "minimize_description_default": "Не розгортати опис за замовчуванням", "yes": "Так", - "import_from_json": "Імпорт з JSON", + "import_from_json": "Імпорт з JSON/CSV", "loop_this_video": "Повтор поточного відео", "auto_play_next_video": "Одразу програвати наступне рекомендоване відео", "donations": "Пожертвування", From 892362b06f664ce597f7c3638894ece7ff47abe3 Mon Sep 17 00:00:00 2001 From: privacytime101 <109485589+privacytime101@users.noreply.github.com> Date: Sun, 24 Jul 2022 00:40:14 -0700 Subject: [PATCH 49/53] Update vi.json --- src/locales/vi.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/vi.json b/src/locales/vi.json index 77fde3b6..80b4fad1 100644 --- a/src/locales/vi.json +++ b/src/locales/vi.json @@ -30,7 +30,7 @@ "language_selection": "Lựa chọn ngôn ngữ", "instances_list": "Danh sách phiên bản", "show_more": "Hiện thị nhiều hơn", - "import_from_json": "Nhập từ JSON", + "import_from_json": "Nhập từ JSON/CSV", "loop_this_video": "Lặp lại video này", "channel_name_desc": "Tên kênh (Z-A)", "default_quality": "Chất lượng mặc định", From 17151bf54a8c0ff997c62fd30f1a0e4cfde3dced Mon Sep 17 00:00:00 2001 From: privacytime101 <109485589+privacytime101@users.noreply.github.com> Date: Sun, 24 Jul 2022 00:40:41 -0700 Subject: [PATCH 50/53] Update zh_Hans.json --- src/locales/zh_Hans.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/zh_Hans.json b/src/locales/zh_Hans.json index 68d8421a..98268eba 100644 --- a/src/locales/zh_Hans.json +++ b/src/locales/zh_Hans.json @@ -9,7 +9,7 @@ "donations": "捐款", "auto_play_next_video": "自动播放下一个视频", "loop_this_video": "循环播放此视频", - "import_from_json": "从 JSON 导入", + "import_from_json": "从 JSON/CSV 导入", "export_to_json": "导出为 JSON", "no": "否", "yes": "是", From f42e625955f0ea765ed71e242a32497dfc34b939 Mon Sep 17 00:00:00 2001 From: privacytime101 <109485589+privacytime101@users.noreply.github.com> Date: Sun, 24 Jul 2022 00:40:58 -0700 Subject: [PATCH 51/53] Update zh_Hant.json --- src/locales/zh_Hant.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/zh_Hant.json b/src/locales/zh_Hant.json index 2a7c09c0..a8585db4 100644 --- a/src/locales/zh_Hant.json +++ b/src/locales/zh_Hant.json @@ -42,7 +42,7 @@ "yes": "是", "no": "否", "export_to_json": "以 JSON 匯出", - "import_from_json": "從 JSON 匯入", + "import_from_json": "從 JSON/CSV 匯入", "loop_this_video": "循環播放此影片", "auto_play_next_video": "自動播放下一部影片", "donations": "捐款", From c96fe3012f15ff7a2664c8755e3c3119b5d419f2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Jul 2022 04:07:49 +0000 Subject: [PATCH 52/53] Bump @intlify/vite-plugin-vue-i18n from 5.0.0 to 5.0.1 Bumps [@intlify/vite-plugin-vue-i18n](https://github.com/intlify/bundle-tools/tree/HEAD/packages/vite-plugin-vue-i18n) from 5.0.0 to 5.0.1. - [Release notes](https://github.com/intlify/bundle-tools/releases) - [Changelog](https://github.com/intlify/bundle-tools/blob/main/packages/vite-plugin-vue-i18n/CHANGELOG.md) - [Commits](https://github.com/intlify/bundle-tools/commits/vite-plugin-vue-i18n@5.0.1/packages/vite-plugin-vue-i18n) --- updated-dependencies: - dependency-name: "@intlify/vite-plugin-vue-i18n" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 1d74596c..7b66f5ce 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "xml-js": "^1.6.11" }, "devDependencies": { - "@intlify/vite-plugin-vue-i18n": "^5.0.0", + "@intlify/vite-plugin-vue-i18n": "^5.0.1", "@vitejs/plugin-legacy": "^1.8.2", "@vitejs/plugin-vue": "^2.3.3", "@vue/compiler-sfc": "3.2.37", diff --git a/yarn.lock b/yarn.lock index 49ac4a2d..7e6d9169 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1022,10 +1022,10 @@ resolved "https://registry.yarnpkg.com/@intlify/shared/-/shared-9.2.0-beta.40.tgz#a850936008e6e865310b2a49136d494dd326faab" integrity sha512-xWz+SFjgt/LfaSbbHVn+V7gmvX4ZNP3cIFta790GWZ/tEgwJeC3tkV7i45iUbZ4ZimOerFgKH05b7qvJlKb6RQ== -"@intlify/vite-plugin-vue-i18n@^5.0.0": - version "5.0.0" - resolved "https://registry.yarnpkg.com/@intlify/vite-plugin-vue-i18n/-/vite-plugin-vue-i18n-5.0.0.tgz#af71abfc1a459238ca94fd3f1e2bd272eb2abd66" - integrity sha512-49W7y2b0m6Cg6qGoBkjdNgxyzFx3iOSbnxvDaWcN65raaceJVuwCwxXX1SqJbjHTg32rpTFi4jSlroqAV9Rr0w== +"@intlify/vite-plugin-vue-i18n@^5.0.1": + version "5.0.1" + resolved "https://registry.yarnpkg.com/@intlify/vite-plugin-vue-i18n/-/vite-plugin-vue-i18n-5.0.1.tgz#80a0b5e1a2428aabecffe41aa9173ebcfe4d61a7" + integrity sha512-+LAUdm5PxGtLrUYgD2Wg9SINmLmhZqrcTnzccfqopca5NvaXWOPnQR4cQOkn82qLuyjWdCYC1BoqMHWBWX/MyQ== dependencies: "@intlify/bundle-utils" next "@intlify/shared" next From e2fd9f6c6850d6ede0f174acf8548d40b4ded17c Mon Sep 17 00:00:00 2001 From: Kavin <20838718+FireMasterK@users.noreply.github.com> Date: Mon, 25 Jul 2022 17:50:42 +0530 Subject: [PATCH 53/53] Cleanup code slightly. --- src/components/ChaptersBar.vue | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/src/components/ChaptersBar.vue b/src/components/ChaptersBar.vue index d777c74e..30feb56a 100644 --- a/src/components/ChaptersBar.vue +++ b/src/components/ChaptersBar.vue @@ -9,11 +9,7 @@ v-for="(chapter, index) in chapters" @click="$emit('seek', chapter.start)" class="chapter-vertical" - :class=" - isCurrentChapter(chapters, index, playerPosition) - ? 'chapter-vertical bg-red-500/50' - : 'chapter-vertical' - " + :class="{ 'bg-red-500/50': isCurrentChapter(index) }" > <div class="flex"> <span class="mt-5 mr-2 text-current" v-text="index + 1" /> @@ -31,7 +27,8 @@ :key="chapter.start" v-for="(chapter, index) in chapters" @click="$emit('seek', chapter.start)" - :class="isCurrentChapter(chapters, index, playerPosition) ? 'chapter bg-red-500/50' : 'chapter'" + class="chapter" + :class="{ 'bg-red-500/50': isCurrentChapter(index) }" > <img :src="chapter.image" :alt="chapter.title" /> <div class="m-1 flex"> @@ -66,24 +63,10 @@ } </style> -<script> -export default { - methods: { - isCurrentChapter(chapters, index, playerPosition) { - if (index + 1 == chapters.length) { - return playerPosition >= chapters[index].start; - } else { - return playerPosition >= chapters[index].start && playerPosition < chapters[index + 1].start; - } - }, - }, -}; -</script> - <script setup> import { defineProps, defineEmits } from "vue"; -defineProps({ +const props = defineProps({ chapters: Object, mobileLayout: { type: Boolean, @@ -95,5 +78,12 @@ defineProps({ }, }); +const isCurrentChapter = index => { + return ( + props.playerPosition >= props.chapters[index].start && + props.playerPosition < (props.chapters[index + 1]?.start ?? Infinity) + ); +}; + defineEmits(["seek"]); </script>