diff options
| -rw-r--r-- | .github/workflows/ci.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/container-release.yml | 2 | ||||
| -rw-r--r-- | Makefile | 118 | ||||
| -rw-r--r-- | README.md | 23 | ||||
| -rw-r--r-- | docker/Dockerfile | 2 | ||||
| -rw-r--r-- | locales/ar.json | 3 | ||||
| -rw-r--r-- | locales/ca.json | 103 | ||||
| -rw-r--r-- | locales/fr.json | 12 | ||||
| -rw-r--r-- | locales/hr.json | 5 | ||||
| -rw-r--r-- | locales/id.json | 122 | ||||
| -rw-r--r-- | locales/ja.json | 3 | ||||
| -rw-r--r-- | locales/pt-BR.json | 4 | ||||
| -rw-r--r-- | locales/sr.json | 371 | ||||
| -rw-r--r-- | locales/tr.json | 2 | ||||
| -rw-r--r-- | src/invidious/routes/misc.cr | 5 | ||||
| -rw-r--r-- | src/invidious/views/channel.ecr | 6 | ||||
| -rw-r--r-- | src/invidious/views/community.ecr | 6 | ||||
| -rw-r--r-- | src/invidious/views/components/item.ecr | 31 | ||||
| -rw-r--r-- | src/invidious/views/components/video-context-buttons.ecr | 21 | ||||
| -rw-r--r-- | src/invidious/views/playlist.ecr | 13 | ||||
| -rw-r--r-- | src/invidious/views/playlists.ecr | 6 | ||||
| -rw-r--r-- | src/invidious/views/watch.ecr | 8 | ||||
| -rw-r--r-- | src/invidious/yt_backend/connection_pool.cr | 2 |
23 files changed, 742 insertions, 128 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index adde39c9..db0987cf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,7 +40,7 @@ jobs: crystal: - 1.0.0 - 1.1.1 - - 1.2.1 + - 1.2.2 include: - crystal: nightly stable: false diff --git a/.github/workflows/container-release.yml b/.github/workflows/container-release.yml index 77b92c6f..36fb566e 100644 --- a/.github/workflows/container-release.yml +++ b/.github/workflows/container-release.yml @@ -27,7 +27,7 @@ jobs: - name: Install Crystal uses: oprypin/install-crystal@v1.2.4 with: - crystal: 1.1.1 + crystal: 1.2.2 - name: Run lint run: | diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..7271d9bd --- /dev/null +++ b/Makefile @@ -0,0 +1,118 @@ +# ----------------------- +# Compilation options +# ----------------------- + +RELEASE := 1 +STATIC := 0 + +DISABLE_LSQUIC := 0 +NO_DBG_SYMBOLS := 0 + + +FLAGS ?= + + +ifeq ($(RELEASE), 1) + FLAGS += --release +endif + +ifeq ($(STATIC), 1) + FLAGS += --static +endif + + +ifeq ($(NO_DBG_SYMBOLS), 1) + FLAGS += --no-debug +else + FLAGS += --debug +endif + +ifeq ($(DISABLE_LSQUIC), 1) + FLAGS += -Ddisable_lsquic +endif + + +# ----------------------- +# Main +# ----------------------- + +all: invidious + +get-libs: + shards install --production + +# TODO: add support for ARM64 via cross-compilation +invidious: get-libs + crystal build src/invidious.cr $(FLAGS) --progress --stats --error-trace + + +run: invidious + ./invidious + + +# ----------------------- +# Development +# ----------------------- + + +format: + crystal tool format + +test: + crystal spec + +verify: + crystal build src/invidious.cr --no-codegen --progress --stats --error-trace + + +# ----------------------- +# (Un)Install +# ----------------------- + +# TODO + + +# ----------------------- +# Cleaning +# ----------------------- + +clean: + rm invidious + +distclean: clean + rm -rf libs + + +# ----------------------- +# Help page +# ----------------------- + +help: + echo "Targets available in this Makefile:" + echo "" + echo "get-libs Fetch Crystal libraries" + echo "invidious Build Invidious" + echo "run Launch Invidious" + echo "" + echo "format Run the Crystal formatter" + echo "test Run tests" + echo "verify Just make sure that the code compiles, but without" + echo " generating any binaries. Useful to search for errors" + echo "" + echo "clean Remove build artifacts" + echo "distclean Remove build artifacts and libraries" + echo "" + echo "" + echo "Build options available for this Makefile:" + echo "" + echo "RELEASE Make a release build (Default: 1)" + echo "STATIC Link librariess tatically (Default: 1)" + echo "" + echo "DISABLE_LSQUIC Don't use lsquic (Default: 0)" + echo "NO_DBG_SYMBOLS Strip debug symbols (Default: 0)" + + + +# No targets generates an output named after themselves +.PHONY: all get-libs build amd64 run +.PHONY: format test verify clean distclean help @@ -8,6 +8,9 @@ <a href="https://github.com/iv-org/invidious/actions"> <img alt="Build Status" src="https://github.com/iv-org/invidious/workflows/Invidious%20CI/badge.svg"> </a> + <a href="https://github.com/iv-org/invidious/commits/master"> + <img alt="GitHub commits" src="https://img.shields.io/github/commit-activity/y/iv-org/invidious?color=red&label=commits"> + </a> <a href="https://github.com/iv-org/invidious/issues"> <img alt="GitHub issues" src="https://img.shields.io/github/issues/iv-org/invidious?color=important"> </a> @@ -17,19 +20,22 @@ <a href="https://hosted.weblate.org/engage/invidious/"> <img alt="Translation Status" src="https://hosted.weblate.org/widgets/invidious/-/translations/svg-badge.svg"> </a> + <a href="https://github.com/humanetech-community/awesome-humane-tech"> <img alt="Awesome Humane Tech" src="https://raw.githubusercontent.com/humanetech-community/awesome-humane-tech/main/humane-tech-badge.svg?sanitize=true"> </a> <h3>An open source alternative front-end to YouTube</h3> + <a href="https://invidious.io/">Website</a> + • <a href="https://instances.invidious.io/">Instances list</a> • - <a href="#documentation">Documentation</a> + <a href="https://docs.invidious.io/">Documentation</a> • <a href="#contribute">Contribute</a> • - <a href="#donate">Donate</a> + <a href="https://invidious.io/donate/">Donate</a> <h5>Chat with us:</h5> <a href="https://matrix.to/#/#invidious:matrix.org"> @@ -133,18 +139,7 @@ Weblate also allows you to log-in with major SSO providers like Github, Gitlab, - [CloudTube](https://sr.ht/~cadence/tube/): A JavaScript-rich alternate YouTube player. - [PeerTubeify](https://gitlab.com/Cha_deL/peertubeify): On YouTube, displays a link to the same video on PeerTube, if it exists. - [MusicPiped](https://github.com/deep-gaurav/MusicPiped): A material design music player that streams music from YouTube. -- [HoloPlay](https://github.com/stephane-r/HoloPlay): Funny Android application connecting on Invidious API's with search, playlists and favoris. - - -## Donate - -Bitcoin (BTC): [bc1qfhe7rq3lqzuayzjxzyt9waz9ytrs09kla3tsgr](bitcoin:bc1qfhe7rq3lqzuayzjxzyt9waz9ytrs09kla3tsgr) - -Monero (XMR): [41nMCtek197boJtiUvGnTFYMatrLEpnpkQDmUECqx5Es2uX3sTKKWVhSL76suXsG3LXqkEJBrCZBgPTwJrDp1FrZJfycGPR](monero:41nMCtek197boJtiUvGnTFYMatrLEpnpkQDmUECqx5Es2uX3sTKKWVhSL76suXsG3LXqkEJBrCZBgPTwJrDp1FrZJfycGPR) - -Ethereum (ETH): [0xD1F7E3Bfb19Ee5a52baED396Ad34717aF18d995B](ethereum:0xD1F7E3Bfb19Ee5a52baED396Ad34717aF18d995B) - -Litecoin (LTC): [ltc1q8787aq2xrseq5yx52axx8c4fqks88zj5vr0zx9](litecoin:ltc1q8787aq2xrseq5yx52axx8c4fqks88zj5vr0zx9) +- [HoloPlay](https://github.com/stephane-r/HoloPlay): Funny Android application connecting on Invidious API's with search, playlists and favorites. ## Liability diff --git a/docker/Dockerfile b/docker/Dockerfile index 21d4269c..5f1c0a11 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM crystallang/crystal:1.2.1-alpine AS builder +FROM crystallang/crystal:1.2.2-alpine AS builder RUN apk add --no-cache sqlite-static yaml-static ARG release diff --git a/locales/ar.json b/locales/ar.json index 15cf89bf..f2d457b6 100644 --- a/locales/ar.json +++ b/locales/ar.json @@ -432,5 +432,6 @@ "adminprefs_modified_source_code_url_label": "URL إلى مستودع التعليمات البرمجية المصدرية المعدلة", "footer_documentation": "التوثيق", "footer_donate_page": "تبرّع", - "preferences_region_label": "بلد المحتوى:. " + "preferences_region_label": "بلد المحتوى:. ", + "preferences_quality_dash_label": "جودة الفيديو المفضلة dash: " } diff --git a/locales/ca.json b/locales/ca.json new file mode 100644 index 00000000..1fa7cc1f --- /dev/null +++ b/locales/ca.json @@ -0,0 +1,103 @@ +{ + "oldest": "més antic", + "Yes": "Sí", + "preferences_quality_label": "Qualitat de vídeo preferida: ", + "newest": "més nou", + "No": "No", + "Google verification code": "Codi de verificació de Google", + "User ID": "ID d'usuari", + "Preferences": "Preferències", + "Dark mode: ": "Mode fosc: ", + "dark": "fosc", + "light": "clar", + "published": "publicat", + "published - reverse": "publicat - invers", + "alphabetically": "alfabèticament", + "alphabetically - reverse": "alfabèticament - invers", + "channel name - reverse": "nom del canal - invers", + "preferences_category_data": "Preferències de dades", + "Delete account": "Elimina compte", + "Save preferences": "Guarda preferències", + "Private": "Privat", + "Show more": "Mostra'n més", + "Show less": "Mostra'n menys", + "Hide replies": "Amaga respostes", + "Arabic": "Àrab", + "Armenian": "Armeni", + "Basque": "Basc", + "Filipino": "Filipí", + "Finnish": "Finès", + "German": "Alemany", + "Greek": "Grec", + "Hungarian": "Hongarès", + "Icelandic": "Islandès", + "Italian": "Italià", + "Japanese": "Japonès", + "Korean": "Coreà", + "Kurdish": "Kurd", + "Lithuanian": "Lituà", + "Luxembourgish": "Luxemburguès", + "Macedonian": "Macedoni", + "Polish": "Polonès", + "Portuguese": "Portuguès", + "Romanian": "Romanès", + "Russian": "Rus", + "Serbian": "Serbi", + "Spanish (Latin America)": "Castellà (Amèrica llatina)", + "Turkish": "Turc", + "Ukrainian": "Ucraïnès", + "preferences_locale_label": "Idioma: ", + "Gaming": "Jocs", + "Movies": "Películes", + "Download": "Descarrega", + "Download as: ": "Descarrega com: ", + "Videos": "Vídeos", + "content_type": "Tipus", + "duration": "Duració", + "sort": "Ordena per", + "week": "Aquesta setmana", + "month": "Aquest mes", + "year": "Aquest any", + "video": "Vídeo", + "channel": "Canal", + "short": "Curt (< 4 minuts)", + "long": "Llarg (> 20 minuts)", + "Current version: ": "Versió actual: ", + "Malay": "Malai", + "Persian": "Persa", + "Slovak": "Eslovac", + "Search": "Busca", + "Show annotations": "Mostra anotacions", + "preferences_region_label": "País del contingut: ", + "preferences_sort_label": "Ordena vídeos per: ", + "Import/export": "Importa/exporta", + "channel name": "nom del canal", + "Title": "Títol", + "Belarusian": "Bielorús", + "Enable web notifications": "Activa notificacions web", + "search": "busca", + "Catalan": "Català", + "Croatian": "Croat", + "preferences_category_admin": "Preferències d'administrador", + "Hide annotations": "Amaga anotacions", + "Show replies": "Mostra respostes", + "Bulgarian": "Búlgar", + "Albanian": "Albanès", + "French": "Francès", + "Irish": "Irlandès", + "Maltese": "Maltès", + "Danish": "Danès", + "Galician": "Gallec", + "Hebrew": "Hebreu", + "Indonesian": "Indonesi", + "Spanish": "Castellà", + "Vietnamese": "Vietnamita", + "News": "Notícies", + "show": "Mostra", + "footer_documentation": "Documentació", + "Thai": "Tailandès", + "Music": "Música", + "relevance": "Rellevància", + "hour": "Última hora", + "today": "Avui" +} diff --git a/locales/fr.json b/locales/fr.json index 2332594a..00971576 100644 --- a/locales/fr.json +++ b/locales/fr.json @@ -423,5 +423,15 @@ "Current version: ": "Version actuelle : ", "next_steps_error_message": "Vous pouvez essayer de : ", "next_steps_error_message_refresh": "Rafraîchir la page", - "next_steps_error_message_go_to_youtube": "Aller sur YouTube" + "next_steps_error_message_go_to_youtube": "Aller sur YouTube", + "preferences_quality_dash_label": "Qualité préférée de la vidéo du tableau de bord : ", + "footer_source_code": "Code source", + "preferences_region_label": "Pays du contenu : ", + "footer_donate_page": "Faire un don", + "footer_modfied_source_code": "Code source modifié", + "short": "Courte (< 4 minutes)", + "long": "Longue (> 20 minutes)", + "adminprefs_modified_source_code_url_label": "URL du dépôt du code source modifié", + "footer_documentation": "Documentation", + "footer_original_source_code": "Code source original" } diff --git a/locales/hr.json b/locales/hr.json index 6b8c718c..9b5f9250 100644 --- a/locales/hr.json +++ b/locales/hr.json @@ -68,7 +68,7 @@ "preferences_listen_label": "Standardno slušaj: ", "preferences_local_label": "Koristi posrednika videa: ", "preferences_speed_label": "Standardna brzina: ", - "preferences_quality_label": "Primarna kvaliteta videa: ", + "preferences_quality_label": "Preferirana kvaliteta videa: ", "preferences_volume_label": "Glasnoća playera: ", "preferences_comments_label": "Standardni komentari: ", "youtube": "YouTube", @@ -432,5 +432,6 @@ "footer_modfied_source_code": "Izmijenjeni izvorni kod", "footer_documentation": "Dokumentacija", "footer_original_source_code": "Izvoran izvorni kod", - "preferences_region_label": "Zemlja sadržaja: " + "preferences_region_label": "Zemlja sadržaja: ", + "preferences_quality_dash_label": "Preferirana kvaliteta dash-videa: " } diff --git a/locales/id.json b/locales/id.json index 07910143..054a2557 100644 --- a/locales/id.json +++ b/locales/id.json @@ -12,9 +12,9 @@ "": "`x` daftar putar" }, "LIVE": "SIARAN LANGSUNG", - "Shared `x` ago": "Dibagikan`x` lalu", + "Shared `x` ago": "Dibagikan `x` yang lalu", "Unsubscribe": "Batal Langganan", - "Subscribe": "Langganan", + "Subscribe": "Berlangganan", "View channel on YouTube": "Lihat kanal di YouTube", "View playlist on YouTube": "Lihat daftar putar di YouTube", "newest": "terbaru", @@ -44,11 +44,11 @@ "Export data as JSON": "Ekspor data sebagai JSON", "Delete account?": "Hapus akun?", "History": "Riwayat", - "An alternative front-end to YouTube": "Sebuah alternatif front-end untuk YouTube", + "An alternative front-end to YouTube": "Sebuah alternatif layar depan untuk YouTube", "JavaScript license information": "Informasi lisensi JavaScript", "source": "sumber", "Log in": "Masuk", - "Log in/register": "Daftar", + "Log in/register": "Masuk/Daftar", "Log in with Google": "Masuk dengan Google", "User ID": "ID Pengguna", "Password": "Kata Sandi", @@ -62,21 +62,21 @@ "Preferences": "Preferensi", "preferences_category_player": "Preferensi pemutar", "preferences_video_loop_label": "Selalu ulangi: ", - "preferences_autoplay_label": "Putar-Otomatis: ", - "preferences_continue_label": "Putar selanjutnya secara default: ", - "preferences_continue_autoplay_label": "Otomatis-Putar video berikutnya: ", - "preferences_listen_label": "Dengarkan secara default: ", - "preferences_local_label": "Video Proksi: ", - "preferences_speed_label": "Kecepatan default: ", + "preferences_autoplay_label": "Putar Otomatis: ", + "preferences_continue_label": "Putar selanjutnya secara baku: ", + "preferences_continue_autoplay_label": "Putar otomatis video berikutnya: ", + "preferences_listen_label": "Dengarkan secara baku: ", + "preferences_local_label": "Proksi video: ", + "preferences_speed_label": "Kecepatan baku: ", "preferences_quality_label": "Kualitas video yang disukai: ", "preferences_volume_label": "Volume pemutar: ", - "preferences_comments_label": "Komentar default: ", + "preferences_comments_label": "Komentar baku: ", "youtube": "YouTube", "reddit": "Reddit", - "preferences_captions_label": "Subtitel default: ", - "Fallback captions: ": "Subtitel fallback: ", + "preferences_captions_label": "Takarir baku: ", + "Fallback captions: ": "Takarir cadangan: ", "preferences_related_videos_label": "Tampilkan video terkait: ", - "preferences_annotations_label": "Tampilkan anotasi secara default: ", + "preferences_annotations_label": "Tampilkan anotasi secara baku: ", "preferences_extend_desc_label": "Perluas deskripsi video secara otomatis: ", "preferences_vr_mode_label": "Video interaktif 360°: ", "preferences_category_visual": "Preferensi visual", @@ -89,16 +89,16 @@ "preferences_category_misc": "Preferensi lainnya", "preferences_automatic_instance_redirect_label": "Pengalihan peladen otomatis (balik kembali ke redirect.invidious.io): ", "preferences_category_subscription": "Preferensi langganan", - "preferences_annotations_subscribed_label": "Tampilkan anotasi secara default untuk kanal langganan: ", + "preferences_annotations_subscribed_label": "Tampilkan anotasi secara baku untuk kanal yang dilanggan? ", "Redirect homepage to feed: ": "Arahkan kembali laman beranda ke umpan: ", "preferences_max_results_label": "Jumlah video ditampilkan di umpan: ", "preferences_sort_label": "Urutkan video berdasarkan: ", "published": "dipublikasi", - "published - reverse": "dipublikasi - sebaliknya", + "published - reverse": "dipublikasi - terbalik", "alphabetically": "menurut abjad", - "alphabetically - reverse": "menurut abjad - sebaliknya", + "alphabetically - reverse": "menurut abjad - terbalik", "channel name": "nama kanal", - "channel name - reverse": "nama kanal - sebaliknya", + "channel name - reverse": "nama kanal - terbalik", "Only show latest video from channel: ": "Hanya tampilkan video terbaru dari kanal: ", "Only show latest unwatched video from channel: ": "Hanya tampilkan video belum ditonton terbaru dari kanal: ", "preferences_unseen_only_label": "Hanya tampilkan belum ditonton: ", @@ -106,7 +106,7 @@ "Enable web notifications": "Aktifkan pemberitahuan web", "`x` uploaded a video": "`x` mengunggah video", "`x` is live": "`x` sedang siaran langsung", - "preferences_category_data": "Preferensi Data", + "preferences_category_data": "Preferensi data", "Clear watch history": "Bersihkan riwayat tontonan", "Import/export data": "Impor/Ekspor data", "Change password": "Ganti kata sandi", @@ -115,13 +115,13 @@ "Watch history": "Riwayat tontonan", "Delete account": "Hapus akun", "preferences_category_admin": "Preferensi administrator", - "preferences_default_home_label": "Laman beranda default: ", + "preferences_default_home_label": "Laman beranda baku: ", "preferences_feed_menu_label": "Menu umpan: ", "preferences_show_nick_label": "Tampilkan nama panggilan di atas: ", "Top enabled: ": "Teratas diaktifkan: ", "CAPTCHA enabled: ": "CAPTCHA diaktifkan: ", "Login enabled: ": "Masuk diaktifkan: ", - "Registration enabled: ": "Registrasi diaktifkan: ", + "Registration enabled: ": "Pendaftaran diaktifkan: ", "Report statistics: ": "Laporan statistik: ", "Save preferences": "Simpan preferensi", "Subscription manager": "Pengatur langganan", @@ -161,7 +161,7 @@ "Title": "Judul", "Playlist privacy": "Privasi daftar putar", "Editing playlist `x`": "Menyunting daftar putar `x`", - "Show more": "Tampilkan lainnya", + "Show more": "Tampilkan lebih banyak", "Show less": "Tampilkan lebih sedikit", "Watch on YouTube": "Tonton di YouTube", "Switch Invidious Instance": "Ganti peladen Invidious", @@ -175,9 +175,9 @@ "Engagement: ": "Keterlibatan: ", "Whitelisted regions: ": "Wilayah daftar-putih: ", "Blacklisted regions: ": "Wilayah daftar-hitam: ", - "Shared `x`": "Berbagi`x`", + "Shared `x`": "Berbagi `x`", "`x` views": { - "([^.,0-9]|^)1([^.,0-9]|$)": "`x` tampilan.([^.,0-9]|^)1([^.,0-9]|$)", + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` tampilan", "": "`x` tampilan" }, "Premieres in `x`": "Tayang dalam `x`", @@ -186,7 +186,7 @@ "View YouTube comments": "Lihat komentar YouTube", "View more comments on Reddit": "Lihat lebih banyak komentar di Reddit", "View `x` comments": { - "([^.,0-9]|^)1([^.,0-9]|$)": "Lihat`x` komentar.([^.,0-9]|^)1([^.,0-9]|$)", + "([^.,0-9]|^)1([^.,0-9]|$)": "Lihat`x` komentar", "": "Lihat`x` komentar" }, "View Reddit comments": "Lihat komentar Reddit", @@ -209,7 +209,7 @@ "Please log in": "Harap masuk", "Invidious Private Feed for `x`": "Umpan pribadi Invidious untuk`x`", "channel:`x`": "kanal:`x`", - "Deleted or invalid channel": "Kanal terhapus atau invalid", + "Deleted or invalid channel": "Kanal terhapus atau tidak valid", "This channel does not exist.": "Kanal ini tidak ada.", "Could not get channel info.": "Tidak bisa mendapatkan info kanal.", "Could not fetch comments": "Tidak dapat memuat komentar", @@ -220,8 +220,8 @@ "`x` ago": "`x` lalu", "Load more": "Muat lebih banyak", "`x` points": { - "([^.,0-9]|^)1([^.,0-9]|$)": "`x` titik", - "": "`x` titik" + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` poin", + "": "`x` poin" }, "Could not create mix.": "Tidak dapat membuat mix.", "Empty playlist": "Daftar putar kosong", @@ -368,15 +368,15 @@ "([^.,0-9]|^)1([^.,0-9]|$)": "`x` detik", "": "`x` detik" }, - "Fallback comments: ": "Komentar mundur: ", + "Fallback comments: ": "Komentar alternatif: ", "Popular": "Populer", "Search": "Cari", "Top": "Teratas", - "About": "Ihwal", - "Rating: ": "Peringkat: ", + "About": "Tentang", + "Rating: ": "Rating: ", "preferences_locale_label": "Bahasa: ", - "View as playlist": "Tampilkan sebagai daftar putar", - "Default": "Asali", + "View as playlist": "Lihat sebagai daftar putar", + "Default": "Baku", "Music": "Musik", "Gaming": "Permainan", "News": "Berita", @@ -385,7 +385,7 @@ "Download as: ": "Unduh sebagai: ", "%A %B %-d, %Y": "%A %B %-d, %Y", "(edited)": "(disunting)", - "YouTube comment permalink": "Komentar YouTube permalink", + "YouTube comment permalink": "Tautan permanen komentar YouTube", "permalink": "tautan permanen", "`x` marked it with a ❤": "`x` telah ditandai dengan ❤", "Audio mode": "Mode audio", @@ -393,33 +393,33 @@ "Videos": "Video", "Playlists": "Daftar putar", "Community": "Komunitas", - "relevance": "Relevan", - "rating": "peringkat", - "date": "tanggal", - "views": "ditonton", - "content_type": "tipe_konten", - "duration": "durasi", - "features": "fitur", - "sort": "urut", - "hour": "jam", - "today": "hari ini", - "week": "minggu", - "month": "bulan", - "year": "tahun", - "video": "video", - "channel": "kanal", - "playlist": "daftar putar", - "movie": "film", - "show": "tampilkan", - "hd": "hd", - "subtitles": "subtitel", - "creative_commons": "creative_commons", - "3d": "3d", - "live": "siaran langsung", - "4k": "4k", - "location": "lokasi", - "hdr": "hdr", - "filter": "saring", + "relevance": "Relevansi", + "rating": "Rating", + "date": "Tanggal unggah", + "views": "Jumlah ditonton", + "content_type": "Tipe", + "duration": "Durasi", + "features": "Fitur", + "sort": "Urut Berdasarkan", + "hour": "Jam Terakhir", + "today": "Hari Ini", + "week": "Pekan Ini", + "month": "Bulan Ini", + "year": "Tahun Ini", + "video": "Video", + "channel": "Kanal", + "playlist": "Daftar Putar", + "movie": "Film", + "show": "Pertunjukan/Acara", + "hd": "HD", + "subtitles": "Takarir", + "creative_commons": "Creative Commons", + "3d": "3D", + "live": "Siaran Langsung", + "4k": "4K", + "location": "Lokasi", + "hdr": "HDR", + "filter": "Saring", "Current version: ": "Versi saat ini: ", "next_steps_error_message": "Setelah itu Anda harus mencoba: ", "next_steps_error_message_refresh": "Segarkan", diff --git a/locales/ja.json b/locales/ja.json index ea334e98..c7764d33 100644 --- a/locales/ja.json +++ b/locales/ja.json @@ -432,5 +432,6 @@ "adminprefs_modified_source_code_url_label": "編集したソースコードのレポジトリーURL", "long": "20 分以上", "preferences_region_label": "地域: ", - "footer_donate_page": "寄付する" + "footer_donate_page": "寄付する", + "preferences_quality_dash_label": "優先するDash画質 : " } diff --git a/locales/pt-BR.json b/locales/pt-BR.json index 072deff2..6baa2c0d 100644 --- a/locales/pt-BR.json +++ b/locales/pt-BR.json @@ -431,5 +431,7 @@ "footer_documentation": "Documentação", "footer_source_code": "Código fonte", "footer_original_source_code": "Código fonte original", - "footer_modfied_source_code": "Código Fonte Modificado" + "footer_modfied_source_code": "Código Fonte Modificado", + "preferences_quality_dash_label": "Qualidade de vídeo do painel preferida: ", + "preferences_region_label": "País do conteúdo: " } diff --git a/locales/sr.json b/locales/sr.json index 0082bd66..e0713b43 100644 --- a/locales/sr.json +++ b/locales/sr.json @@ -19,7 +19,7 @@ "View playlist on YouTube": "Погледај списак извођења на YouTube-у", "newest": "најновије", "oldest": "најстарије", - "popular": "гласовито", + "popular": "популарно", "last": "последње", "Next page": "Следећа страница", "Previous page": "Претходна страница", @@ -66,5 +66,372 @@ "preferences_continue_label": "Увек подразумевано пуштај следеће: ", "preferences_continue_autoplay_label": "Самопуштање следећег видео записа: ", "preferences_listen_label": "Увек подразумевано укључен само звук: ", - "preferences_local_label": "Приказ видео записа преко посредника: " + "preferences_local_label": "Приказ видео записа преко посредника: ", + "Playlist privacy": "Подешавања приватности плеј листе", + "Editing playlist `x`": "Измена плеј листе `x`", + "Please sign in using 'Log in with Google'": "Молимо Вас да се пријавите помоћу 'Log in with Google'", + "Playlist does not exist.": "Непостојећа плеј листа.", + "Erroneous challenge": "Погрешан изазов", + "Maltese": "Малтешки", + "Download": "Преузми", + "Download as: ": "Преузми као: ", + "Quota exceeded, try again in a few hours": "Квота је премашена, молимо Вас да покушате за пар сати", + "Bangla": "Бангла/Бенгалски", + "preferences_quality_dash_label": "Преферирани квалитет dash видео формата: ", + "Token manager": "Меначер токена", + "Token": "Токен", + "`x` tokens": { + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` токен", + "": "`x` токена" + }, + "Import/export": "Увези/Извези", + "revoke": "опозови", + "`x` unseen notifications": { + "": "`x` непрегледаних обавештења", + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` непрегледаних обавештења" + }, + "search": "претрага", + "Log out": "Одјава", + "Source available here.": "Изворни код.", + "Trending": "У тренду", + "Updated `x` ago": "Ажурирано пре `x`", + "Delete playlist `x`?": "Обриши плеј листу `x`?", + "Create playlist": "Направи плеј листу", + "Show less": "Прикажи мање", + "Switch Invidious Instance": "Промени Invidious инстанцу", + "Hide annotations": "Сакриј напомене", + "User ID is a required field": "Кориснички ID је обавезно поље", + "Wrong username or password": "Погрешно корисничко име или лозинка", + "Please log in": "Молимо Вас да се пријавите", + "channel:`x`": "канал:`x`", + "Could not fetch comments": "Узимање коментара није успело", + "`x` points": { + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` поен", + "": "`x` поена" + }, + "Could not create mix.": "Прављење микса није успело.", + "Empty playlist": "Празна плеј листа", + "Not a playlist.": "Није плеј листа.", + "Could not pull trending pages.": "Учитавање 'У току' странције није успело.", + "Token is expired, please try again": "Токен је истекао, молимо Вас да покушате поново", + "English (auto-generated)": "Енглески (аутоматски генерисано)", + "Afrikaans": "Африканс", + "Albanian": "Албански", + "Armenian": "Јерменски", + "Azerbaijani": "Азербејџански", + "Basque": "Баскијски", + "Bosnian": "Српски (Босна и Херцеговина)", + "Bulgarian": "Бугарски", + "Burmese": "Бурмански", + "Catalan": "Каталонски", + "Cebuano": "Cebuano", + "Chinese (Traditional)": "Кинески (Традиционални)", + "Corsican": "Корзикански", + "Danish": "Дански", + "Kannada": "Канада (Језик)", + "Kazakh": "Казашки", + "Russian": "Руски", + "Scottish Gaelic": "Шкотски Гелски", + "Sinhala": "Синхалешки", + "Slovak": "Словачки", + "Spanish": "Шпански", + "Spanish (Latin America)": "Шпански (Јужна Америка)", + "Sundanese": "Сундски", + "Swedish": "Шведски", + "Tajik": "Таџички", + "Telugu": "Телугу", + "Turkish": "Турски", + "Ukrainian": "Украјински", + "Urdu": "Урду", + "Uzbek": "Узбечки", + "Vietnamese": "Вијетнамски", + "`x` minutes": { + "": "`x` минута", + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` минут" + }, + "`x` seconds": { + "": "`x` секунди", + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` секунда" + }, + "Rating: ": "Оцена/е: ", + "View as playlist": "Погледај као плеј листу", + "Default": "Подразумеван/о", + "Gaming": "Гејминг", + "Movies": "Филмови", + "%A %B %-d, %Y": "%A %B %-d, %Y", + "(edited)": "(измењено)", + "YouTube comment permalink": "YouTube коментар трајна веза", + "Audio mode": "Аудио мод", + "Playlists": "Плеј листе", + "relevance": "Ревелантно", + "rating": "Оцене", + "date": "Датум отпремања", + "views": "Број прегледа", + "`x` marked it with a ❤": "`x` је означио/ла ово са ❤", + "duration": "Трајање", + "features": "Карактеристике", + "hour": "Последњи сат", + "week": "Ове недеље", + "month": "Овај месец", + "year": "Ове године", + "video": "Видео", + "playlist": "Плеј листа", + "movie": "Филм", + "long": "Дуг (> 20 минута)", + "hd": "HD", + "creative_commons": "Creative Commons (Лиценца)", + "3d": "3Д", + "hdr": "Видео високе резолуције", + "filter": "Филтер", + "next_steps_error_message": "Можете урадити нешта од следећег: ", + "next_steps_error_message_go_to_youtube": "Иди на YouTube", + "footer_documentation": "Документација", + "preferences_region_label": "Држава порекла садржаја: ", + "preferences_player_style_label": "Стил плејера: ", + "preferences_dark_mode_label": "Изглед/Тема: ", + "light": "светла", + "preferences_thin_mode_label": "Компактни режим: ", + "preferences_category_misc": "Остала подешавања", + "preferences_automatic_instance_redirect_label": "Аутоматско пребацивање на другу инстанцу у случају отказивања (пређи на redirect.invidious.io): ", + "alphabetically - reverse": "по алфабету - обрнуто", + "Enable web notifications": "Омогући обавештења у веб претраживачу", + "`x` is live": "`x` преноси уживо", + "Manage tokens": "Управљај токенима", + "Watch history": "Историја гледања", + "preferences_feed_menu_label": "Feed мени: ", + "preferences_show_nick_label": "Прикажи надимке на врху: ", + "CAPTCHA enabled: ": "CAPTCHA омогућена: ", + "Registration enabled: ": "Регистрација омогућена: ", + "Subscription manager": "Менаџер претплата", + "Wilson score: ": "Wilson скор: ", + "Engagement: ": "Ангажовање: ", + "Whitelisted regions: ": "Дозвољени региони: ", + "Shared `x`": "Подељено `x`", + "`x` views": { + "": "`x` прегледа", + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` преглед" + }, + "Premieres in `x`": "Премијера у `x`", + "Premieres `x`": "Премијере у `x`", + "Hi! Looks like you have JavaScript turned off. Click here to view comments, keep in mind they may take a bit longer to load.": "Хеј! Изгледа да сте онемогућили JavaScript. Кликните овде да видите коментаре, имајте на уму да ово може да потраје дуже док се не учитају.", + "View `x` comments": { + "([^.,0-9]|^)1([^.,0-9]|$)": "Прикажи `x` коментар", + "": "Прикажи `x` коментара" + }, + "View Reddit comments": "Прикажи Reddit коментаре", + "Unable to log in, make sure two-factor authentication (Authenticator or SMS) is turned on.": "Неуспешна пријава, проверите да ли сте упалили двофакторну аутентикацију (Аутентикатор или СМС).", + "CAPTCHA is a required field": "CAPTCHA је обавезно поље", + "Croatian": "Хрватски", + "Estonian": "Естонски", + "Filipino": "Филипино", + "French": "Француски", + "Galician": "Галицијски", + "German": "Немачки", + "Greek": "Грчки", + "Hausa": "Хауса", + "Italian": "Италијански", + "Khmer": "Кмерски", + "Kurdish": "Курдски", + "Kyrgyz": "Киргиски", + "Latvian": "Летонски", + "Lithuanian": "Литвански", + "Macedonian": "Македонски", + "Malagasy": "Малгашки", + "Malay": "Малајски", + "Marathi": "Маратхи", + "Mongolian": "Монголски", + "Norwegian Bokmål": "Норвешки Бокмал", + "Nyanja": "Чева", + "Pashto": "Паштунски", + "Persian": "Персијски", + "Punjabi": "Пунџаби", + "Romanian": "Румунски", + "Welsh": "Велшки", + "Western Frisian": "Западнофризијски", + "`x` years": { + "": "`x` година", + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` година" + }, + "`x` weeks": { + "": "`x` недеља", + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` недеља" + }, + "`x` days": { + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` дан", + "": "`x` дана" + }, + "`x` hours": { + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` сат", + "": "`x` сати" + }, + "Fallback comments: ": "Коментари у случају отказивања: ", + "Popular": "Популарно", + "Search": "Претрага", + "About": "О програму", + "footer_source_code": "Изворни Код", + "footer_original_source_code": "Оригинални изворни код", + "preferences_related_videos_label": "Прикажи сличне видео клипове: ", + "preferences_annotations_label": "Прикажи напомене подразумевано: ", + "preferences_extend_desc_label": "Аутоматски прикажи цео опис видеа: ", + "preferences_vr_mode_label": "Интерактивни видео клипови у 360 степени: ", + "preferences_category_visual": "Визуелне преференце", + "preferences_captions_label": "Подразумевани титл: ", + "Music": "Музика", + "content_type": "Тип", + "Broken? Try another Invidious Instance": "Не функционише исправно? Пробајте другу Invidious инстанцу", + "Tamil": "Тамилски", + "Save preferences": "Сачувај подешавања", + "Only show latest unwatched video from channel: ": "Прикажи само последње видео клипове који нису погледани са канала: ", + "Xhosa": "Коса (Језик)", + "channel": "Канал", + "Hungarian": "Мађарски", + "Maori": "Маори (Језик)", + "Manage subscriptions": "Управљај претплатама", + "Hindi": "Хинди", + "`x` ago": "пре `x`", + "Import/export data": "Увези/Извези податке", + "`x` uploaded a video": "`x` је отпремио/ла видео клип", + "View `x` replies": { + "([^.,0-9]|^)1([^.,0-9]|$)": "Погледај `x` одоговор", + "": "Погледај `x` одоговора" + }, + "Delete account": "Обриши налог", + "preferences_default_home_label": "Подразумевана почетна страница: ", + "Serbian": "Српски", + "License: ": "Лиценца: ", + "live": "Уживо", + "Report statistics: ": "Извештавај о статистици: ", + "Only show latest video from channel: ": "Приказуј последње видео клипове само са канала: ", + "channel name - reverse": "име канала - обрнуто", + "Could not get channel info.": "Узимање података о каналу није успело.", + "View privacy policy.": "Погледај политику приватности.", + "Change password": "Промени лозинку", + "Malayalam": "Малајалам", + "View more comments on Reddit": "Прикажи више коментара на Reddit-у", + "Portuguese": "Португалски", + "View YouTube comments": "Прикажи YouTube коментаре", + "published - reverse": "објављено - обрнуто", + "Dutch": "Белгијски", + "preferences_volume_label": "Јачина звука: ", + "preferences_locale_label": "Језик: ", + "`x` subscriptions": { + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` пратиоц", + "": "`x` пратилаца" + }, + "adminprefs_modified_source_code_url_label": "URL веза до репозиторијума са измењеним изворним кодом", + "Community": "Заједница", + "Video mode": "Видео мод", + "Fallback captions: ": "Титл у случају да главни није доступан: ", + "Private": "Приватно", + "alphabetically": "по алфабету", + "No such user": "Непостојећи корисник", + "Subscriptions": "Праћења", + "today": "Данас", + "Finnish": "Фински", + "Lao": "Лаоски", + "Login enabled: ": "Пријава омогућена: ", + "Shona": "Шона", + "location": "Локација", + "Load more": "Учитај више", + "Released under the AGPLv3 on Github.": "Избачено под лиценцом AGPLv3 на Github-у.", + "Slovenian": "Словеначки", + "View JavaScript license information.": "Погледај информације лиценце везане за JavaScript.", + "Chinese (Simplified)": "Кинески (Поједностављени)", + "preferences_comments_label": "Подразумевани коментари: ", + "Incorrect password": "Нетачна лозинка", + "Show replies": "Прикажи одговоре", + "Invidious Private Feed for `x`": "Invidious приватни Feed за `x`", + "Watch on YouTube": "Гледај на YouTube-у", + "Wrong answer": "Погрешан одговор", + "preferences_quality_label": "Преферирани видео квалитет: ", + "Hide replies": "Сакриј одговоре", + "Invalid TFA code": "Неважећи TFA код", + "Login failed. This may be because two-factor authentication is not turned on for your account.": "Неуспешна пријава! Ово се можда дешава јер двофакторна аутентикација није омогућена на Вашем налогу.", + "Erroneous CAPTCHA": "Погрешна CAPTCHA", + "Erroneous token": "Погрешан токен", + "Czech": "Чешки", + "Latin": "Латински", + "Videos": "Видео клипови", + "4k": "4К", + "footer_donate_page": "Донирај", + "English": "Енглески", + "Arabic": "Арапски", + "Unlisted": "Ненаведено", + "Hidden field \"challenge\" is a required field": "Сакривено \"challenge\" поље је обавезно", + "Hidden field \"token\" is a required field": "Сакривено \"token\" поље је обавезно", + "Georgian": "Грузијски", + "Hawaiian": "Хавајски", + "Hebrew": "Хебрејски", + "Icelandic": "Исландски", + "Igbo": "Игбо", + "Japanese": "Јапански", + "Javanese": "Јавански", + "Sindhi": "Синди", + "Swahili": "Свахили", + "Yiddish": "Јидиш", + "Zulu": "Зулу", + "subtitles": "Титл", + "Password cannot be longer than 55 characters": "Лозинка не може бити дужа од 55 карактера", + "This channel does not exist.": "Овај канал не постоји.", + "Belarusian": "Белоруски", + "Gujarati": "Гуџарати", + "Haitian Creole": "Хаићански Креолски", + "Somali": "Сомалијски", + "Top": "Врх", + "footer_modfied_source_code": "Измењени изворни код", + "preferences_category_subscription": "Подешавања праћења", + "preferences_annotations_subscribed_label": "Подразумевано приказати напомене за канале које пратите? ", + "preferences_max_results_label": "Број видео клипова приказаних у листи (feed-у): ", + "preferences_sort_label": "Сортирај видео клипове по: ", + "preferences_unseen_only_label": "Прикажи само видео клипове који нису погледани: ", + "preferences_notifications_only_label": "Прикажи само обавештења (ако их уопште има): ", + "preferences_category_data": "Подешавања података", + "Clear watch history": "Обриши историју гледања", + "preferences_category_admin": "Администраторска подешавања", + "published": "објављено", + "sort": "Сортирај према", + "show": "Шоу", + "short": "Кратак (< 4 минута)", + "Current version: ": "Тренутна верзија: ", + "Top enabled: ": "Врх омогућен: ", + "Public": "Јавно", + "Delete playlist": "Обриши плеј листу", + "Title": "Наслов", + "Show annotations": "Прикажи напомене", + "Password cannot be empty": "Лозинка не може бити празна", + "Deleted or invalid channel": "Обрисан или непостојећи канал", + "Esperanto": "Есперанто", + "Hmong": "Хмонг", + "Luxembourgish": "Луксембуршки", + "Nepali": "Непалски", + "Samoan": "Самоански", + "News": "Вести", + "permalink": "трајна веза", + "Password is a required field": "Лозинка је обавезно поље", + "Amharic": "Амхарски", + "Indonesian": "Индонежански", + "Irish": "Ирски", + "Korean": "Корејски", + "Southern Sotho": "Сото", + "Thai": "Тајски", + "`x` months": { + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` месец", + "": "`x` месеци" + }, + "preferences_speed_label": "Подразумевана брзина: ", + "Dark mode: ": "Тамни режим: ", + "dark": "тамна", + "Redirect homepage to feed: ": "Пребаци са почетне странице на листу (feed): ", + "channel name": "име канала", + "View all playlists": "Прегледај све плеј листе", + "Show more": "Прикажи више", + "Genre: ": "Жанр: ", + "Family friendly? ": "Погодно за породицу? ", + "next_steps_error_message_refresh": "Освежи страницу", + "youtube": "YouTube", + "reddit": "Reddit", + "unsubscribe": "прекини са праћењем", + "Blacklisted regions: ": "Блокирани региони: ", + "Polish": "Пољски", + "Yoruba": "Јоруба" } diff --git a/locales/tr.json b/locales/tr.json index 3bb9405d..6e753bfc 100644 --- a/locales/tr.json +++ b/locales/tr.json @@ -256,7 +256,7 @@ "Croatian": "Hırvatça", "Czech": "Çekçe", "Danish": "Danca", - "Dutch": "Flemenkçe", + "Dutch": "Felemenkçe", "Esperanto": "Esperanto", "Estonian": "Estonca", "Filipino": "Filipince", diff --git a/src/invidious/routes/misc.cr b/src/invidious/routes/misc.cr index 0e6356d0..3ea4c272 100644 --- a/src/invidious/routes/misc.cr +++ b/src/invidious/routes/misc.cr @@ -40,11 +40,6 @@ module Invidious::Routes::Misc def self.cross_instance_redirect(env) referer = get_referer(env) - - if !env.get("preferences").as(Preferences).automatic_instance_redirect - return env.redirect("https://redirect.invidious.io#{referer}") - end - instance_url = fetch_random_instance env.redirect "https://#{instance_url}#{referer}" end diff --git a/src/invidious/views/channel.ecr b/src/invidious/views/channel.ecr index 7f797e37..40b553a9 100644 --- a/src/invidious/views/channel.ecr +++ b/src/invidious/views/channel.ecr @@ -45,7 +45,11 @@ <div class="pure-u-1-3"> <a href="https://www.youtube.com/channel/<%= ucid %>"><%= translate(locale, "View channel on YouTube") %></a> <div class="pure-u-1 pure-md-1-3"> - <a href="/redirect?referer=<%= env.get?("current_page") %>"><%= translate(locale, "Switch Invidious Instance") %></a> + <% if env.get("preferences").as(Preferences).automatic_instance_redirect%> + <a href="/redirect?referer=<%= env.get?("current_page") %>"><%= translate(locale, "Switch Invidious Instance") %></a> + <% else %> + <a href="https://redirect.invidious.io<%= env.request.path %>"><%= translate(locale, "Switch Invidious Instance") %></a> + <% end %> </div> <% if !channel.auto_generated %> <div class="pure-u-1 pure-md-1-3"> diff --git a/src/invidious/views/community.ecr b/src/invidious/views/community.ecr index 15d8ed1e..f0add06b 100644 --- a/src/invidious/views/community.ecr +++ b/src/invidious/views/community.ecr @@ -44,7 +44,11 @@ <div class="pure-u-1-3"> <a href="https://www.youtube.com/channel/<%= channel.ucid %>/community"><%= translate(locale, "View channel on YouTube") %></a> <div class="pure-u-1 pure-md-1-3"> - <a href="/redirect?referer=<%= env.get?("current_page") %>"><%= translate(locale, "Switch Invidious Instance") %></a> + <% if env.get("preferences").as(Preferences).automatic_instance_redirect%> + <a href="/redirect?referer=<%= env.get?("current_page") %>"><%= translate(locale, "Switch Invidious Instance") %></a> + <% else %> + <a href="https://redirect.invidious.io<%= env.request.resource %>"><%= translate(locale, "Switch Invidious Instance") %></a> + <% end %> </div> <% if !channel.auto_generated %> <div class="pure-u-1 pure-md-1-3"> diff --git a/src/invidious/views/components/item.ecr b/src/invidious/views/components/item.ecr index 5788bf51..a58571aa 100644 --- a/src/invidious/views/components/item.ecr +++ b/src/invidious/views/components/item.ecr @@ -79,19 +79,8 @@ <div class="flex-left"><a href="/channel/<%= item.ucid %>"> <p class="channel-name" dir="auto"><%= HTML.escape(item.author) %></p> </a></div> - <div class="flex-right"> - <div class="icon-buttons"> - <a title="<%=translate(locale, "Watch on YouTube")%>" href="https://www.youtube.com/watch?v=<%= item.id %>&list=<%= item.plid %>"> - <i class="icon ion-logo-youtube"></i> - </a> - <a title="<%=translate(locale, "Audio mode")%>" href="/watch?v=<%= item.id %>&list=<%= item.plid %>&listen=1"> - <i class="icon ion-md-headset"></i> - </a> - <a title="<%=translate(locale, "Switch Invidious Instance")%>" href="/redirect?referer=<%=URI.encode_www_form("watch?v=#{item.id}&list=#{item.plid}")%>"> - <i class="icon ion-md-jet"></i> - </a> - </div> - </div> + <% endpoint_params = "?v=#{item.id}&list=#{item.plid}" %> + <%= rendered "components/video-context-buttons" %> </div> <div class="video-card-row flexible"> @@ -155,19 +144,9 @@ <div class="flex-left"><a href="/channel/<%= item.ucid %>"> <p class="channel-name" dir="auto"><%= HTML.escape(item.author) %></p> </a></div> - <div class="flex-right"> - <div class="icon-buttons"> - <a title="<%=translate(locale, "Watch on YouTube")%>" href="https://www.youtube.com/watch?v=<%= item.id %>"> - <i class="icon ion-logo-youtube"></i> - </a> - <a title="<%=translate(locale, "Audio mode")%>" href="/watch?v=<%= item.id %>&listen=1"> - <i class="icon ion-md-headset"></i> - </a> - <a title="<%=translate(locale, "Switch Invidious Instance")%>" href="/redirect?referer=<%=URI.encode_www_form("watch?v=#{item.id}")%>"> - <i class="icon ion-md-jet"></i> - </a> - </div> - </div> + + <% endpoint_params = "?v=#{item.id}" %> + <%= rendered "components/video-context-buttons" %> </div> <div class="video-card-row flexible"> diff --git a/src/invidious/views/components/video-context-buttons.ecr b/src/invidious/views/components/video-context-buttons.ecr new file mode 100644 index 00000000..daa107f0 --- /dev/null +++ b/src/invidious/views/components/video-context-buttons.ecr @@ -0,0 +1,21 @@ +<div class="flex-right"> + <div class="icon-buttons"> + <a title="<%=translate(locale, "Watch on YouTube")%>" href="https://www.youtube.com/watch<%=endpoint_params%>"> + <i class="icon ion-logo-youtube"></i> + </a> + <a title="<%=translate(locale, "Audio mode")%>" href="/watch<%=endpoint_params%>&listen=1"> + <i class="icon ion-md-headset"></i> + </a> + + <% if env.get("preferences").as(Preferences).automatic_instance_redirect%> + <a title="<%=translate(locale, "Switch Invidious Instance")%>" href="/redirect?referer=%2Fwatch<%=URI.encode_www_form(endpoint_params)%>"> + <i class="icon ion-md-jet"></i> + </a> + <% else %> + <a title="<%=translate(locale, "Switch Invidious Instance")%>" href="https://redirect.invidious.io/watch<%=endpoint_params%>"> + <i class="icon ion-md-jet"></i> + </a> + <% end %> + + </div> +</div>
\ No newline at end of file diff --git a/src/invidious/views/playlist.ecr b/src/invidious/views/playlist.ecr index 12f93a72..d0518de7 100644 --- a/src/invidious/views/playlist.ecr +++ b/src/invidious/views/playlist.ecr @@ -41,9 +41,16 @@ <%= translate(locale, "View playlist on YouTube") %> </a> <span> | </span> - <a href="/redirect?referer=<%= env.get?("current_page") %>"> - <%= translate(locale, "Switch Invidious Instance") %> - </a> + + <% if env.get("preferences").as(Preferences).automatic_instance_redirect%> + <a href="/redirect?referer=<%= env.get?("current_page") %>"> + <%= translate(locale, "Switch Invidious Instance") %> + </a> + <% else %> + <a href="https://redirect.invidious.io<%= env.request.resource %>"> + <%= translate(locale, "Switch Invidious Instance") %> + </a> + <% end %> </div> <% end %> </div> diff --git a/src/invidious/views/playlists.ecr b/src/invidious/views/playlists.ecr index 1245256f..12dba088 100644 --- a/src/invidious/views/playlists.ecr +++ b/src/invidious/views/playlists.ecr @@ -47,7 +47,11 @@ </div> <div class="pure-u-1 pure-md-1-3"> - <a href="/redirect?referer=<%= env.get?("current_page") %>"><%= translate(locale, "Switch Invidious Instance") %></a> + <% if env.get("preferences").as(Preferences).automatic_instance_redirect%> + <a href="/redirect?referer=<%= env.get?("current_page") %>"><%= translate(locale, "Switch Invidious Instance") %></a> + <% else %> + <a href="https://redirect.invidious.io<%= env.request.resource %>"><%= translate(locale, "Switch Invidious Instance") %></a> + <% end %> </div> <div class="pure-u-1 pure-md-1-3"> diff --git a/src/invidious/views/watch.ecr b/src/invidious/views/watch.ecr index cad36e73..9cf00393 100644 --- a/src/invidious/views/watch.ecr +++ b/src/invidious/views/watch.ecr @@ -11,7 +11,7 @@ <meta property="og:url" content="<%= HOST_URL %>/watch?v=<%= video.id %>"> <meta property="og:title" content="<%= title %>"> <meta property="og:image" content="/vi/<%= video.id %>/maxres.jpg"> -<meta property="og:description" content="<%= video.short_description %>"> +<meta property="og:description" content="<%= HTML.escape(video.short_description) %>"> <meta property="og:type" content="video.other"> <meta property="og:video:url" content="<%= HOST_URL %>/embed/<%= video.id %>"> <meta property="og:video:secure_url" content="<%= HOST_URL %>/embed/<%= video.id %>"> @@ -22,7 +22,7 @@ <meta name="twitter:site" content="@omarroth1"> <meta name="twitter:url" content="<%= HOST_URL %>/watch?v=<%= video.id %>"> <meta name="twitter:title" content="<%= title %>"> -<meta name="twitter:description" content="<%= video.short_description %>"> +<meta name="twitter:description" content="<%= HTML.escape(video.short_description) %>"> <meta name="twitter:image" content="<%= HOST_URL %>/vi/<%= video.id %>/maxres.jpg"> <meta name="twitter:player" content="<%= HOST_URL %>/embed/<%= video.id %>"> <meta name="twitter:player:width" content="1280"> @@ -116,7 +116,11 @@ we're going to need to do it here in order to allow for translations. (<a href="https://www.youtube.com/embed/<%= video.id %>"><%= translate(locale, "Embed") %></a>) </span> <p id="watch-on-another-invidious-instance"> + <% if env.get("preferences").as(Preferences).automatic_instance_redirect%> <a href="/redirect?referer=<%= env.get?("current_page") %>"><%= translate(locale, "Switch Invidious Instance") %></a> + <% else %> + <a href="https://redirect.invidious.io<%= env.request.resource %>"><%= translate(locale, "Switch Invidious Instance") %></a> + <% end %> </p> <p id="embed-link"> <a href="<%= embed_link %>"><%= translate(locale, "Embed Link") %></a> diff --git a/src/invidious/yt_backend/connection_pool.cr b/src/invidious/yt_backend/connection_pool.cr index fe7a572d..3feb9233 100644 --- a/src/invidious/yt_backend/connection_pool.cr +++ b/src/invidious/yt_backend/connection_pool.cr @@ -1,5 +1,3 @@ -require "lsquic" - {% unless flag?(:disable_quic) %} require "lsquic" |