From 648b2884e449153b2a62c68e4cf3cb6bda721194 Mon Sep 17 00:00:00 2001 From: Preston Date: Wed, 16 Sep 2020 09:51:26 -0400 Subject: [PATCH] Enable more locales and replace https://invidio.us defaults with https://invidious.snopyta.org --- src/renderer/App.css | 4 ++++ src/renderer/App.js | 3 +++ src/renderer/App.vue | 3 ++- .../general-settings/general-settings.js | 17 ++++++++++++++++- .../general-settings/general-settings.vue | 4 ++-- src/renderer/main.js | 2 +- src/renderer/store/modules/settings.js | 4 ++-- static/locales/ar.yaml | 6 +++--- static/locales/as.yaml | 4 ++-- static/locales/de-DE.yaml | 6 +++--- static/locales/en-US.yaml | 6 +++--- static/locales/es-MX.yaml | 6 +++--- static/locales/es.yaml | 4 ++-- static/locales/es_AR.yaml | 4 ++-- static/locales/fi.yaml | 8 ++++---- static/locales/fil.yaml | 4 ++-- static/locales/fr-FR.yaml | 4 ++-- static/locales/hr.yaml | 8 ++++---- static/locales/it.yaml | 4 ++-- static/locales/ja.yaml | 6 +++--- static/locales/nb_NO.yaml | 6 +++--- static/locales/nl.yaml | 6 +++--- static/locales/pl.yaml | 8 ++++---- static/locales/pt-BR.yaml | 8 ++++---- static/locales/pt-PT.yaml | 8 ++++---- static/locales/ru.yaml | 6 +++--- static/locales/sk.yaml | 6 +++--- static/locales/vi.yaml | 7 ++++--- static/locales/zh-CN.yaml | 4 ++-- static/locales/zh-TW.yaml | 4 ++-- 30 files changed, 97 insertions(+), 73 deletions(-) diff --git a/src/renderer/App.css b/src/renderer/App.css index 3b231266..d5185287 100644 --- a/src/renderer/App.css +++ b/src/renderer/App.css @@ -15,6 +15,10 @@ body { outline: none; } +.rightAligned: { + text-align: right; +} + .routerView { margin-left: 200px; margin-top: 80px; diff --git a/src/renderer/App.js b/src/renderer/App.js index b56904b2..daafe54b 100644 --- a/src/renderer/App.js +++ b/src/renderer/App.js @@ -38,6 +38,9 @@ export default Vue.extend({ }, showProgressBar: function () { return this.$store.getters.getShowProgressBar + }, + isRightAligned: function () { + return this.$i18n.locale === 'ar' } }, mounted: function () { diff --git a/src/renderer/App.vue b/src/renderer/App.vue index 2157d2ae..416d2925 100644 --- a/src/renderer/App.vue +++ b/src/renderer/App.vue @@ -2,7 +2,8 @@
diff --git a/src/renderer/components/general-settings/general-settings.js b/src/renderer/components/general-settings/general-settings.js index c69b49f7..bcd41525 100644 --- a/src/renderer/components/general-settings/general-settings.js +++ b/src/renderer/components/general-settings/general-settings.js @@ -567,6 +567,21 @@ export default Vue.extend({ return Object.keys(this.$i18n.messages) }, + localeNames: function () { + const names = [] + + Object.keys(this.$i18n.messages).forEach((locale) => { + const localeName = this.$i18n.messages[locale]['Locale Name'] + if (typeof localeName !== 'undefined') { + names.push(localeName) + } else { + names.push(locale) + } + }) + + return names + }, + backendNames: function () { return [ this.$t('Settings.General Settings.Preferred API Backend.Invidious API'), @@ -624,7 +639,7 @@ export default Vue.extend({ }, beforeDestroy: function () { if (this.invidiousInstance === '') { - this.updateInvidiousInstance('https://invidio.us') + this.updateInvidiousInstance('https://invidious.snopyta.org') } }, methods: { diff --git a/src/renderer/components/general-settings/general-settings.vue b/src/renderer/components/general-settings/general-settings.vue index 4fca61ae..4bc37022 100644 --- a/src/renderer/components/general-settings/general-settings.vue +++ b/src/renderer/components/general-settings/general-settings.vue @@ -66,14 +66,14 @@
- @@ -107,8 +107,8 @@ Settings: Beginning: 'Početak' Middle: 'Sredina' End: 'Kraj' - 'Invidious Instance (Default is https://invidio.us)': 'Invidious instancija (zadano - je https://invidio.us)' + 'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious instancija (zadano + je https://invidious.snopyta.org)' Region for Trending: 'Regija za trendove' #! List countries Theme Settings: @@ -206,7 +206,7 @@ Settings: na gumb "TEST PROXY" poslat će se zahtjev na https://ipinfo.io/json' Use Tor / Proxy for API calls: 'Koristite Tor / Proxy za API pozive' TEST PROXY: 'TESTIRAJ PROXY' - #& Invidious Instance (Default is https://invidio.us) + #& Invidious Instance (Default is https://invidious.snopyta.org) See Public Instances: 'Pogledajte javne instance' Clear History: Clear History: 'Izbriši povijest' diff --git a/static/locales/it.yaml b/static/locales/it.yaml index 45480b76..963fbf93 100644 --- a/static/locales/it.yaml +++ b/static/locales/it.yaml @@ -105,7 +105,7 @@ Settings: Beginning: 'Inizio' Middle: 'Centrato' End: 'Fine' - 'Invidious Instance (Default is https://invidio.us)': 'Istanza Invidious (https://invidio.us + 'Invidious Instance (Default is https://invidious.snopyta.org)': 'Istanza Invidious (https://invidious.snopyta.org di Default)' Region for Trending: 'Regione per le Tendenze' #! List countries @@ -196,7 +196,7 @@ Settings: "PROVA PROXY" manderà una richiesta a https://ipinfo.io/json' Use Tor / Proxy for API calls: 'Usa Tor / Proxy per chiamate API' TEST PROXY: 'PROVA PROXY' - #& Invidious Instance (Default is https://invidio.us) + #& Invidious Instance (Default is https://invidious.snopyta.org) See Public Instances: 'Vedi Istanze Pubbliche' Clear History: Clear History: 'Pulisci Cronologia' diff --git a/static/locales/ja.yaml b/static/locales/ja.yaml index 709246e2..27db789c 100644 --- a/static/locales/ja.yaml +++ b/static/locales/ja.yaml @@ -103,8 +103,8 @@ Settings: Beginning: '最初' Middle: '中間' End: '終了' - 'Invidious Instance (Default is https://invidio.us)': 'Invidious のインスタンス (初期値は - https://invidio.us)' + 'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious のインスタンス (初期値は + https://invidious.snopyta.org)' Region for Trending: '地域の急上昇' #! List countries Theme Settings: @@ -186,7 +186,7 @@ Settings: https://ipinfo.io/json へリクエストを送信します' Use Tor / Proxy for API calls: 'API 呼び出しに Tor/Proxy を使用' TEST PROXY: 'プロキシのテスト' - #& Invidious Instance (Default is https://invidio.us) + #& Invidious Instance (Default is https://invidious.snopyta.org) See Public Instances: '公開インスタンスを参照' Clear History: Clear History: '履歴を消去' diff --git a/static/locales/nb_NO.yaml b/static/locales/nb_NO.yaml index 6f0e3aa9..c2628f4a 100644 --- a/static/locales/nb_NO.yaml +++ b/static/locales/nb_NO.yaml @@ -107,8 +107,8 @@ Settings: Beginning: 'Begynnelsen' Middle: 'Midten' End: 'Slutten' - 'Invidious Instance (Default is https://invidio.us)': 'Individious-instans (forvalget - er https://invidio.us)' + 'Invidious Instance (Default is https://invidious.snopyta.org)': 'Individious-instans (forvalget + er https://invidious.snopyta.org)' Region for Trending: 'Region for populære' #! List countries Theme Settings: @@ -197,7 +197,7 @@ Settings: 'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': '' Use Tor / Proxy for API calls: 'Bruk Tor / mellomtjener for API-kall' TEST PROXY: '' - #& Invidious Instance (Default is https://invidio.us) + #& Invidious Instance (Default is https://invidious.snopyta.org) See Public Instances: '' Clear History: Clear History: 'Tøm historikk' diff --git a/static/locales/nl.yaml b/static/locales/nl.yaml index b385d482..4f77ba38 100644 --- a/static/locales/nl.yaml +++ b/static/locales/nl.yaml @@ -108,8 +108,8 @@ Settings: Beginning: 'Begin' Middle: 'Midden' End: 'Eind' - 'Invidious Instance (Default is https://invidio.us)': 'Invidious Instantie (Standaard - is https://invidio.us)' + 'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious Instantie (Standaard + is https://invidious.snopyta.org)' Region for Trending: 'Regio voor Trending' #! List countries Theme Settings: @@ -207,7 +207,7 @@ Settings: op "TEST PROXY" te klikken zal er een verzoek worden gestuurd naar https://ipinfo.io/json' Use Tor / Proxy for API calls: 'Gebruik Tor / Proxy voor API calls' TEST PROXY: 'TEST PROXY' - #& Invidious Instance (Default is https://invidio.us) + #& Invidious Instance (Default is https://invidious.snopyta.org) See Public Instances: 'Zie Publieke Instanties' Clear History: Clear History: 'Geschiedenis Opschonen' diff --git a/static/locales/pl.yaml b/static/locales/pl.yaml index 26127927..94dbd3f2 100644 --- a/static/locales/pl.yaml +++ b/static/locales/pl.yaml @@ -107,8 +107,8 @@ Settings: Beginning: 'Początek' Middle: 'Środek' End: 'Koniec' - 'Invidious Instance (Default is https://invidio.us)': 'Serwer Invidious (Domyślnie - jest https://invidio.us)' + 'Invidious Instance (Default is https://invidious.snopyta.org)': 'Serwer Invidious (Domyślnie + jest https://invidious.snopyta.org)' Region for Trending: '„Na czasie” z obszaru' #! List countries Theme Settings: @@ -191,7 +191,7 @@ Settings: przycisku „SPRAWDŹ PROXY” wyśle zapytanie na https://ipinfo.io/json' Use Tor / Proxy for API calls: 'Użyj proxy, lub sieci Tor do wywołań API' TEST PROXY: 'SPRAWDŹ PROXY' - #& Invidious Instance (Default is https://invidio.us) + #& Invidious Instance (Default is https://invidious.snopyta.org) See Public Instances: 'Zobacz publiczne serwery' Clear History: Clear History: 'Wyczyść historię' @@ -471,7 +471,7 @@ Canceled next video autoplay: 'Anulowano samoodtworzenie następnego filmu' Yes: 'Tak' No: 'Nie' -Locale Name: polski +Locale Name: Polski Profile: $ is now the active profile: $ jest teraz aktywnym profilem Your default profile has been changed to your primary profile: Twój domyślny profil diff --git a/static/locales/pt-BR.yaml b/static/locales/pt-BR.yaml index 1e262e89..68808894 100644 --- a/static/locales/pt-BR.yaml +++ b/static/locales/pt-BR.yaml @@ -104,8 +104,8 @@ Settings: Beginning: 'No começo' Middle: 'No meio' End: 'No fim' - 'Invidious Instance (Default is https://invidio.us)': 'Instância do Invidious - (A padrão é https://invidio.us)' + 'Invidious Instance (Default is https://invidious.snopyta.org)': 'Instância do Invidious + (A padrão é https://invidious.snopyta.org)' Region for Trending: 'Região para o “Em alta”' #! List countries Theme Settings: @@ -187,7 +187,7 @@ Settings: em "TESTAR PROXY" enviara uma requisição para https://ipinfo.io/json' Use Tor / Proxy for API calls: 'Usar tor / proxy para chamadas da API' TEST PROXY: 'TESTAR PROXY' - #& Invidious Instance (Default is https://invidio.us) + #& Invidious Instance (Default is https://invidious.snopyta.org) See Public Instances: 'Ver instâncias públicas' Clear History: Clear History: 'Apagar histórico' @@ -416,4 +416,4 @@ Canceled next video autoplay: 'Auto-reprodução foi cancelada para o próximo v Yes: 'Sim' No: 'Não' -Locale Name: Inglês +Locale Name: Português (BR) diff --git a/static/locales/pt-PT.yaml b/static/locales/pt-PT.yaml index f2c2aef5..b6f3638e 100644 --- a/static/locales/pt-PT.yaml +++ b/static/locales/pt-PT.yaml @@ -1,5 +1,5 @@ # Put the name of your locale in the same language -Locale Name: Português +Locale Name: Português (PT) FreeTube: FreeTube # Currently on Subscriptions, Playlists, and History 'This part of the app is not ready yet. Come back later when progress has been made.': >- @@ -106,8 +106,8 @@ Settings: Beginning: Princípio Middle: Meio End: Fim - 'Invidious Instance (Default is https://invidio.us)': Instância Invidious (Por - omissão é https://invidio.us) + 'Invidious Instance (Default is https://invidious.snopyta.org)': Instância Invidious (Por + omissão é https://invidious.snopyta.org) Region for Trending: Região para as tendências #! List countries Theme Settings: @@ -241,7 +241,7 @@ Settings: Ao Carregar "TESTAR INTERMEDIÁRIO" um pedido vai ser enviado a https://ipinfo.io/json Use Tor / Proxy for API calls: Usar Tor / Intermediário para Chamadas API TEST PROXY: TESTAR INTERMEDIÁRIO - #& Invidious Instance (Default is https://invidio.us) + #& Invidious Instance (Default is https://invidious.snopyta.org) See Public Instances: Ver Instâncias Públicas Clear History: Clear History: Limpar Histórico diff --git a/static/locales/ru.yaml b/static/locales/ru.yaml index 4b615390..ccbd23be 100644 --- a/static/locales/ru.yaml +++ b/static/locales/ru.yaml @@ -106,8 +106,8 @@ Settings: Beginning: 'В начале' Middle: 'В середине' End: 'В конце' - 'Invidious Instance (Default is https://invidio.us)': 'Экземпляр Invidious (по - умолчанию https://invidio.us)' + 'Invidious Instance (Default is https://invidious.snopyta.org)': 'Экземпляр Invidious (по + умолчанию https://invidious.snopyta.org)' Region for Trending: 'Регион для трендов' #! List countries Theme Settings: @@ -191,7 +191,7 @@ Settings: кнопки "ТЕСТ ПРОКСИ" отправит запрос на https://ipinfo.io/json' Use Tor / Proxy for API calls: 'Использовать Tor / Прокси для вызовов API' TEST PROXY: 'ТЕСТ ПРОКСИ' - #& Invidious Instance (Default is https://invidio.us) + #& Invidious Instance (Default is https://invidious.snopyta.org) See Public Instances: 'См. общедоступные экземпляры' Clear History: Clear History: 'Очистить историю' diff --git a/static/locales/sk.yaml b/static/locales/sk.yaml index 8a46c5c4..176d552c 100644 --- a/static/locales/sk.yaml +++ b/static/locales/sk.yaml @@ -103,8 +103,8 @@ Settings: Beginning: 'Začiatok' Middle: 'Stred' End: 'Koniec' - 'Invidious Instance (Default is https://invidio.us)': 'Invidious príklad (Predvolená - hodnota je https://invidio.us)' + 'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious príklad (Predvolená + hodnota je https://invidious.snopyta.org)' Region for Trending: 'Región pre trendy' #! List countries Theme Settings: @@ -183,7 +183,7 @@ Settings: 'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': '' Use Tor / Proxy for API calls: '' TEST PROXY: '' - #& Invidious Instance (Default is https://invidio.us) + #& Invidious Instance (Default is https://invidious.snopyta.org) See Public Instances: '' Clear History: Clear History: '' diff --git a/static/locales/vi.yaml b/static/locales/vi.yaml index 11e11792..14b11d07 100644 --- a/static/locales/vi.yaml +++ b/static/locales/vi.yaml @@ -1,3 +1,4 @@ +Locale Name: Tiếng Việt FreeTube: 'FreeTube' # Currently on Subscriptions, Playlists, and History 'This part of the app is not ready yet. Come back later when progress has been made.': >- @@ -103,8 +104,8 @@ Settings: Beginning: 'Lúc đầu' Middle: 'Chính giữa' End: 'Đầu cuối' - 'Invidious Instance (Default is https://invidio.us)': 'Phiên bản Invidious (Mặc - định là https://invidio.us)' + 'Invidious Instance (Default is https://invidious.snopyta.org)': 'Phiên bản Invidious (Mặc + định là https://invidious.snopyta.org)' Region for Trending: 'Phổ biến theo quốc gia' #! List countries Theme Settings: @@ -187,7 +188,7 @@ Settings: nút "TEST PROXY" sẽ gửi một yêu cầu đến https://ipinfo.io/json' Use Tor / Proxy for API calls: 'Sử dụng Tor / Proxy cho API calls' TEST PROXY: 'TEST PROXY' - #& Invidious Instance (Default is https://invidio.us) + #& Invidious Instance (Default is https://invidious.snopyta.org) See Public Instances: 'Xem Instances công cộng' Clear History: Clear History: 'Xóa lịch sử' diff --git a/static/locales/zh-CN.yaml b/static/locales/zh-CN.yaml index 021e798c..2832ed91 100644 --- a/static/locales/zh-CN.yaml +++ b/static/locales/zh-CN.yaml @@ -103,7 +103,7 @@ Settings: Beginning: '开始' Middle: '中间' End: '结尾' - 'Invidious Instance (Default is https://invidio.us)': 'Invidious实例（默认https://invidio.us）' + 'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious实例（默认https://invidious.snopyta.org）' Region for Trending: '热门区域' #! List countries Theme Settings: @@ -183,7 +183,7 @@ Settings: 'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': '点击“测试代理”健将发送请求给https://ipinfo.io/json' Use Tor / Proxy for API calls: '用Tor / 代理给API呼叫' TEST PROXY: '测试代理' - #& Invidious Instance (Default is https://invidio.us) + #& Invidious Instance (Default is https://invidious.snopyta.org) See Public Instances: '显示公共实例' Clear History: Clear History: '清除历史记录' diff --git a/static/locales/zh-TW.yaml b/static/locales/zh-TW.yaml index 4395f9dd..dbcc1098 100644 --- a/static/locales/zh-TW.yaml +++ b/static/locales/zh-TW.yaml @@ -103,7 +103,7 @@ Settings: Beginning: '開始' Middle: '中間' End: '結尾' - 'Invidious Instance (Default is https://invidio.us)': 'Invidious實例（預設https://invidio.us）' + 'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious實例（預設https://invidious.snopyta.org）' Region for Trending: '熱門區域' #! List countries Theme Settings: @@ -183,7 +183,7 @@ Settings: 'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': '點擊“測試代理”健將傳送要求給https://ipinfo.io/json' Use Tor / Proxy for API calls: '用Tor / 代理給API呼叫' TEST PROXY: '測試代理' - #& Invidious Instance (Default is https://invidio.us) + #& Invidious Instance (Default is https://invidious.snopyta.org) See Public Instances: '察看公用實例' Clear History: Clear History: '清除曆史紀錄'