Merge branch 'development' into piped-support

This commit is contained in:
ChunkyProgrammer 2023-11-01 07:58:56 -04:00
commit 2ae441dc28
10 changed files with 28 additions and 2 deletions

View File

@ -29,7 +29,6 @@ export default defineComponent({
return {
isLoading: false,
dataAvailable: false,
proxyTestUrl: 'https://ipwho.is/?output=json&fields=ip,country,city,region',
proxyIp: '',
proxyCountry: '',
proxyRegion: '',
@ -64,6 +63,22 @@ export default defineComponent({
},
proxyUrl: function () {
return `${this.proxyProtocol}://${this.proxyHostname}:${this.proxyPort}`
},
lang: function() {
return this.$i18n.locale.replace('_', '-')
},
localeToUse: function() {
// locales found here: https://ipwhois.io/documentation
const supportedLangs = ['en', 'ru', 'de', 'es', 'pt-BR', 'fr', 'zh-CN', 'ja']
return supportedLangs.find(lang => this.lang === lang) ?? supportedLangs.find(lang => this.lang.substring(0, 2) === lang.substring(0, 2))
},
proxyTestUrl: function() {
let proxyTestUrl = 'https://ipwho.is/?output=json&fields=ip,country,city,region'
if (this.localeToUse) {
proxyTestUrl += `&lang=${this.localeToUse}`
}
return proxyTestUrl
}
},
created: function () {

View File

@ -151,6 +151,7 @@ Settings:
Middle: 'وسط'
End: 'نهاية'
Hidden: مخفي
Blur: الضبابية
'Invidious Instance (Default is https://invidious.snopyta.org)': 'حالة Invidious
(الافتراضية هي https://invidious.snopyta.org)'
Region for Trending: 'المنطقة للأكثر شيوعاً'

View File

@ -35,6 +35,8 @@ Forward: 'Endavant'
Global:
Videos: 'Vídeos'
Live: En directe
Community: Comunitat
Version {versionNumber} is now available! Click for more details: 'La versió {versionNumber}
està disponible! Fes clic per a més detalls'
Download From Site: 'Descarrega des del web'
@ -92,6 +94,7 @@ Subscriptions:
This profile has a large number of subscriptions. Forcing RSS to avoid rate limiting: Aquest
perfil té un gran nombre de subscripcions. Forçant RSS per evitar la limitació
fixada
Error Channels: Canals amb errors
Trending:
Trending: 'Tendències'
Default: Per defecte

View File

@ -166,6 +166,7 @@ Settings:
Middle: 'Střed'
End: 'Konec'
Hidden: Skryté
Blur: Rozmazané
'Invidious Instance (Default is https://invidious.snopyta.org)': 'Instance Invidious
(Výchozí je https://invidious.snopyta.org)'
Region for Trending: 'Oblast pro trendy'
@ -179,7 +180,7 @@ Settings:
instance
Current Invidious Instance: Současná instance Invidious
No default instance has been set: Není nastavena žádná výchozí instance
The currently set default instance is {instance}: Současné výchozí instance je
The currently set default instance is {instance}: Aktuální výchozí instance je
{instance}
External Link Handling:
No Action: Žádná akce

View File

@ -155,6 +155,7 @@ Settings:
Middle: 'Mitad'
End: 'Final'
Hidden: Oculto
Blur: Difuminar
'Invidious Instance (Default is https://invidious.snopyta.org)': 'Instancia de
Invidious (por defecto es https://invidious.snopyta.org)'
Region for Trending: 'Región de las tendencias'

View File

@ -161,6 +161,7 @@ Settings:
Middle: 'Milieu'
End: 'Fin'
Hidden: Caché
Blur: Flou
'Invidious Instance (Default is https://invidious.snopyta.org)': 'Instance Individious
(https://invidious.snopyta.org par défaut)'
Region for Trending: 'Pays pour les tendances'

View File

@ -158,6 +158,7 @@ Settings:
Middle: 'Nel mezzo'
End: 'Fine'
Hidden: Nascoste
Blur: Sfocatura
'Invidious Instance (Default is https://invidious.snopyta.org)': 'Istanza Invidious
(La predefinita è https://invidious.snopyta.org)'
Region for Trending: 'Regione per le tendenze'

View File

@ -167,6 +167,7 @@ Settings:
Middle: 'Средина'
End: 'Крај'
Hidden: Скривено
Blur: Замагљено
'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious инстанца
(Подразумевано је https://invidious.snopyta.org)'
View all Invidious instance information: 'Погледај све информације о Invidious

View File

@ -144,6 +144,7 @@ Settings:
Middle: '中间'
End: '结尾'
Hidden: 隐藏缩略图
Blur: 模糊
'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious实例默认https://invidious.snopyta.org'
Region for Trending: '热门区域'
#! List countries

View File

@ -143,6 +143,7 @@ Settings:
Middle: '中間'
End: '結尾'
Hidden: 隱藏
Blur: 模糊
'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious實例(預設為
https://invidious.snopyta.org )'
Region for Trending: '發燒影片區域'