From d3c5feaf1b0c7eda98f05f6df4d56d6dfdb407ee Mon Sep 17 00:00:00 2001 From: Harvey Tindall Date: Sat, 17 Jun 2023 12:48:28 +0100 Subject: [PATCH] userpage: use form langfile, move login strings to common login-related stuff was moved into common using the langmover script, so that the user page doesn't have to use the admin language files. --- .gitignore | 3 + api-userpage.go | 21 +- html/user.html | 2 +- lang/admin/da-dk.json | 8 +- lang/admin/de-de.json | 8 +- lang/admin/el-gr.json | 8 +- lang/admin/en-gb.json | 8 +- lang/admin/en-us.json | 8 +- lang/admin/es-es.json | 8 +- lang/admin/fr-fr.json | 8 +- lang/admin/hu-hu.json | 8 +- lang/admin/id-id.json | 8 +- lang/admin/nl-nl.json | 8 +- lang/admin/{pl-PL.json => pl-pl.json} | 8 +- lang/admin/pt-br.json | 8 +- lang/admin/sv-se.json | 8 +- lang/admin/vi-vn.json | 8 +- lang/admin/zh-hans.json | 8 +- lang/admin/{zh-Hant.json => zh-hant.json} | 8 +- lang/common/ar-aa.json | 7 + lang/common/da-dk.json | 12 +- lang/common/de-de.json | 20 +- lang/common/el-gr.json | 14 +- lang/common/en-gb.json | 36 +- lang/common/en-us.json | 12 +- lang/common/es-es.json | 22 +- lang/common/fa-ir.json | 5 +- lang/common/fr-fr.json | 23 +- lang/common/hu-hu.json | 10 + lang/common/id-id.json | 12 +- lang/common/{it-IT.json => it-it.json} | 5 +- lang/common/nl-nl.json | 20 +- lang/common/{pl-PL.json => pl-pl.json} | 7 +- lang/common/pt-br.json | 20 +- lang/common/ro-ro.json | 7 + lang/common/sl-si.json | 5 +- lang/common/sv-se.json | 12 +- lang/common/vi-vn.json | 13 + lang/common/zh-hans.json | 12 +- lang/common/{zh-Hant.json => zh-hant.json} | 12 +- lang/email/da-dk.json | 2 +- lang/email/de-de.json | 2 +- lang/email/el-gr.json | 2 +- lang/email/en-gb.json | 2 +- lang/email/en-us.json | 2 +- lang/email/es-es.json | 2 +- lang/email/fr-fr.json | 2 +- lang/email/id-id.json | 2 +- lang/email/it-it.json | 2 +- lang/email/nl-nl.json | 2 +- lang/email/{pl-PL.json => pl-pl.json} | 2 +- lang/email/pt-br.json | 2 +- lang/email/{ro-RO.json => ro-ro.json} | 2 +- lang/email/sv-se.json | 2 +- lang/email/zh-hans.json | 2 +- lang/email/{zh-Hant.json => zh-hant.json} | 2 +- lang/form/ar-aa.json | 2 +- lang/form/da-dk.json | 2 +- lang/form/de-de.json | 2 +- lang/form/el-gr.json | 2 +- lang/form/en-gb.json | 2 +- lang/form/en-us.json | 5 +- lang/form/es-es.json | 2 +- lang/form/fa-ir.json | 2 +- lang/form/fr-fr.json | 2 +- lang/form/hu-hu.json | 2 +- lang/form/id-id.json | 2 +- lang/form/it-it.json | 2 +- lang/form/nl-nl.json | 2 +- lang/form/{pl-PL.json => pl-pl.json} | 2 +- lang/form/pt-br.json | 2 +- lang/form/{ro-RO.json => ro-ro.json} | 2 +- lang/form/sl-si.json | 2 +- lang/form/sv-se.json | 2 +- lang/form/{vi-VN.json => vi-vn.json} | 2 +- lang/form/zh-hans.json | 2 +- lang/form/{zh-Hant.json => zh-hant.json} | 2 +- lang/pwreset/ar-aa.json | 2 +- lang/pwreset/da-dk.json | 2 +- lang/pwreset/de-de.json | 2 +- lang/pwreset/en-gb.json | 2 +- lang/pwreset/en-us.json | 2 +- lang/pwreset/es-es.json | 2 +- lang/pwreset/fa-ir.json | 2 +- lang/pwreset/fr-fr.json | 2 +- lang/pwreset/nl-nl.json | 2 +- lang/pwreset/{pl-PL.json => pl-pl.json} | 2 +- lang/pwreset/pt-br.json | 2 +- lang/pwreset/{ro-RO.json => ro-ro.json} | 2 +- lang/pwreset/sl-si.json | 2 +- lang/pwreset/zh-hans.json | 2 +- lang/pwreset/{zh-Hant.json => zh-hant.json} | 2 +- lang/setup/da-dk.json | 2 +- lang/setup/de-de.json | 2 +- lang/setup/el-gr.json | 2 +- lang/setup/en-gb.json | 2 +- lang/setup/en-us.json | 2 +- lang/setup/es-es.json | 2 +- lang/setup/fr-fr.json | 2 +- lang/setup/{hu-HU.json => hu-hu.json} | 2 +- lang/setup/id-id.json | 2 +- lang/setup/nl-nl.json | 2 +- lang/setup/{pl-PL.json => pl-pl.json} | 2 +- lang/setup/pt-br.json | 2 +- lang/setup/sl-si.json | 2 +- lang/setup/sv-se.json | 2 +- lang/setup/zh-hans.json | 2 +- lang/setup/{zh-Hant.json => zh-hant.json} | 2 +- lang/telegram/{ar-AA.json => ar-aa.json} | 2 +- lang/telegram/da-dk.json | 2 +- lang/telegram/de-de.json | 2 +- lang/telegram/en-gb.json | 2 +- lang/telegram/en-us.json | 2 +- lang/telegram/es-es.json | 2 +- lang/telegram/fa-ir.json | 2 +- lang/telegram/fr-fr.json | 2 +- lang/telegram/{it-IT.json => it-it.json} | 2 +- lang/telegram/nl-nl.json | 2 +- lang/telegram/{pl-PL.json => pl-pl.json} | 2 +- lang/telegram/pt-br.json | 2 +- lang/telegram/{ro-RO.json => ro-ro.json} | 2 +- lang/telegram/sl-si.json | 2 +- lang/telegram/zh-hans.json | 2 +- lang/telegram/{zh-Hant.json => zh-hant.json} | 2 +- main.go | 3 + models.go | 6 + package-lock.json | 366 +++++++++---------- package.json | 2 +- router.go | 2 +- ts/user.ts | 21 +- views.go | 32 +- 131 files changed, 569 insertions(+), 474 deletions(-) rename lang/admin/{pl-PL.json => pl-pl.json} (96%) rename lang/admin/{zh-Hant.json => zh-hant.json} (97%) create mode 100644 lang/common/ar-aa.json create mode 100644 lang/common/hu-hu.json rename lang/common/{it-IT.json => it-it.json} (96%) rename lang/common/{pl-PL.json => pl-pl.json} (78%) create mode 100644 lang/common/ro-ro.json create mode 100644 lang/common/vi-vn.json rename lang/common/{zh-Hant.json => zh-hant.json} (69%) rename lang/email/{pl-PL.json => pl-pl.json} (99%) rename lang/email/{ro-RO.json => ro-ro.json} (99%) rename lang/email/{zh-Hant.json => zh-hant.json} (99%) rename lang/form/{pl-PL.json => pl-pl.json} (99%) rename lang/form/{ro-RO.json => ro-ro.json} (99%) rename lang/form/{vi-VN.json => vi-vn.json} (99%) rename lang/form/{zh-Hant.json => zh-hant.json} (99%) rename lang/pwreset/{pl-PL.json => pl-pl.json} (99%) rename lang/pwreset/{ro-RO.json => ro-ro.json} (99%) rename lang/pwreset/{zh-Hant.json => zh-hant.json} (99%) rename lang/setup/{hu-HU.json => hu-hu.json} (99%) rename lang/setup/{pl-PL.json => pl-pl.json} (99%) rename lang/setup/{zh-Hant.json => zh-hant.json} (99%) rename lang/telegram/{ar-AA.json => ar-aa.json} (99%) rename lang/telegram/{it-IT.json => it-it.json} (99%) rename lang/telegram/{pl-PL.json => pl-pl.json} (99%) rename lang/telegram/{ro-RO.json => ro-ro.json} (99%) rename lang/telegram/{zh-Hant.json => zh-hant.json} (99%) diff --git a/.gitignore b/.gitignore index 03f01d5..06a5ef1 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,6 @@ cl.md mautrix/ tempts/ matacc.txt +scripts/langmover/lang +scripts/langmover/lang2 +scripts/langmover/out diff --git a/api-userpage.go b/api-userpage.go index 37672f1..65a0dd4 100644 --- a/api-userpage.go +++ b/api-userpage.go @@ -2,6 +2,23 @@ package main import "github.com/gin-gonic/gin" -func (app *appContext) HelloWorld(gc *gin.Context) { - gc.JSON(200, stringResponse{"It worked!", "none"}) +// @Summary Returns the logged-in user's Jellyfin ID & Username. +// @Produce json +// @Success 200 {object} MyDetailsDTO +// @Router /my/details [get] +// @tags User Page +func (app *appContext) MyDetails(gc *gin.Context) { + resp := MyDetailsDTO{ + Id: gc.GetString("jfId"), + } + + user, status, err := app.jf.UserByID(resp.Id, false) + if status != 200 || err != nil { + app.err.Printf("Failed to get Jellyfin user (%d): %+v\n", status, err) + respond(500, "Failed to get user", gc) + return + } + resp.Username = user.Name + + gc.JSON(200, resp) } diff --git a/html/user.html b/html/user.html index 9bb58e4..8dbc97b 100644 --- a/html/user.html +++ b/html/user.html @@ -44,7 +44,7 @@ {{ template "login-modal.html" . }}
- Not logged in. +
diff --git a/lang/admin/da-dk.json b/lang/admin/da-dk.json index 98ad911..63fd01f 100644 --- a/lang/admin/da-dk.json +++ b/lang/admin/da-dk.json @@ -15,8 +15,6 @@ "warning": "Advarsel", "inviteInfiniteUsesWarning": "invitationer med uendelig brug kan blive misbrugt", "inviteSendToEmail": "Send til", - "login": "Log på", - "logout": "Log ud", "create": "Opret", "apply": "Anvend", "delete": "Slet", @@ -128,13 +126,9 @@ "updateAppliedRefresh": "Opdatering anvendt, genindlæs venligst siden.", "telegramVerified": "Telegram konto verificeret.", "accountConnected": "Konto tilsluttet.", - "errorConnection": "Kunne ikke oprette forbindelse til jfa-go.", - "error401Unauthorized": "Adgang nægtet. Prøv at genindlæse siden.", "errorSettingsAppliedNoHomescreenLayout": "Indstillingerne blev anvendt, men anvendelse af startskærmens layout mislykkedes muligvis.", "errorHomescreenAppliedNoSettings": "Startskærmens layout blev anvendt, men anvendelsen af indstillingerne mislykkedes muligvis.", "errorSettingsFailed": "Ansøgningen mislykkedes.", - "errorLoginBlank": "Brugernavnet og/eller adgangskoden blev efterladt tomme.", - "errorUnknown": "Ukendt fejl.", "errorSaveEmail": "Kunne ikke gemme e-mail.", "errorBlankFields": "Felter blev efterladt tomme", "errorDeleteProfile": "Kunne ikke slette profilen {n}", @@ -217,4 +211,4 @@ "plural": "Indstil udløb for {n} brugere" } } -} +} \ No newline at end of file diff --git a/lang/admin/de-de.json b/lang/admin/de-de.json index 416a9fa..2a93467 100644 --- a/lang/admin/de-de.json +++ b/lang/admin/de-de.json @@ -13,8 +13,6 @@ "warning": "Warnung", "inviteInfiniteUsesWarning": "Invites mit unendlich vielen Verwendungen können missbräuchlich verwendet werden", "inviteSendToEmail": "Senden an", - "login": "Anmelden", - "logout": "Abmelden", "create": "Erstellen", "apply": "Anwenden", "delete": "Löschen", @@ -122,13 +120,9 @@ "createProfile": "Profil {n} erstellt.", "saveSettings": "Einstellungen wurden gespeichert", "setOmbiDefaults": "Ombi-Standardeinstellungen gespeichert.", - "errorConnection": "Konnte keine Verbindung zu jfa-go herstellen.", - "error401Unauthorized": "Unberechtigt. Versuch, die Seite zu aktualisieren.", "errorSettingsAppliedNoHomescreenLayout": "Einstellungen wurden angewendet, aber die Anwendung des Startbildschirmlayouts ist möglicherweise fehlgeschlagen.", "errorHomescreenAppliedNoSettings": "Startbildschirmlayout wurde angewendet, aber die Anwendung der Einstellungen ist möglicherweise fehlgeschlagen.", "errorSettingsFailed": "Anwendung ist fehlgeschlagen.", - "errorLoginBlank": "Der Benutzername und/oder das Passwort wurden nicht ausgefüllt.", - "errorUnknown": "Unbekannter Fehler.", "errorBlankFields": "Felder wurden nicht ausgefüllt", "errorDeleteProfile": "Fehler beim Löschen des Profils {n}", "errorLoadProfiles": "Fehler beim Laden der Profile.", @@ -217,4 +211,4 @@ "plural": "Ablauf für {n} Benutzer setzen" } } -} +} \ No newline at end of file diff --git a/lang/admin/el-gr.json b/lang/admin/el-gr.json index 937ae4e..98b2310 100644 --- a/lang/admin/el-gr.json +++ b/lang/admin/el-gr.json @@ -13,8 +13,6 @@ "warning": "Προσοχή", "inviteInfiniteUsesWarning": "μπορεί να γίνει κατάχρηση των προσκλήσεων με άπειρες χρήσεις", "inviteSendToEmail": "Αποστολή σε", - "login": "Σύνδεση", - "logout": "Αποσύνδεση", "create": "Δημιουργία", "apply": "Εφαρμογή", "delete": "Διαγραφή", @@ -98,13 +96,9 @@ "createProfile": "Δημιουργήθηκε το {n} προφίλ.", "saveSettings": "Οι ρυθμίσεις αποθηκεύτηκαν", "setOmbiDefaults": "Αποθηκεύτηκαν οι προκαθορισμένες ρυθμίσεις του ombi.", - "errorConnection": "Δεν μπόρεσε να συνδεθεί με το jfa-go.", - "error401Unauthorized": "Ανεξουσιοδότητος. Προσπαθήστε να κάνετε επαναφόρτωση την σελίδα.", "errorSettingsAppliedNoHomescreenLayout": "Οι ρυθμίσεις αποθηκεύτηκαν, αλλά η καταχώρηση δομής αρχικής οθόνης ίσως απέτυχε.", "errorHomescreenAppliedNoSettings": "Η δομή αρχικής οθόνης εφαρμόστηκε, αλλά οι ρυθμίσεις ίσως απέτυχαν.", "errorSettingsFailed": "Η εφαρμογή απέτυχε.", - "errorLoginBlank": "Το όνομα χρήστη και/ή ο κωδικός ήταν κενά.", - "errorUnknown": "Άγνωστο σφάλμα.", "errorBlankFields": "Τα πεφία ήταν κενά", "errorDeleteProfile": "Αποτυχία διαγραφής του προφίλ {n}", "errorLoadProfiles": "Αποτυχία φόρτωσης των προφίλ.", @@ -183,4 +177,4 @@ "plural": "Εργοποιήθηκαν {n} χρήστες." } } -} +} \ No newline at end of file diff --git a/lang/admin/en-gb.json b/lang/admin/en-gb.json index f0b68f2..705d837 100644 --- a/lang/admin/en-gb.json +++ b/lang/admin/en-gb.json @@ -68,8 +68,6 @@ "inviteHours": "Hours", "inviteInfiniteUsesWarning": "invites with infinite uses can be used abusively", "inviteSendToEmail": "Send to", - "login": "Login", - "logout": "Logout", "apply": "Apply", "delete": "Delete", "updates": "Updates", @@ -175,9 +173,7 @@ }, "notifications": { "errorSettingsFailed": "Application failed.", - "errorLoginBlank": "The username and/or password was left blank.", "errorLoadSettings": "Failed to load settings.", - "errorUnknown": "Unknown error.", "errorDeleteProfile": "Failed to delete profile {n}", "sentAnnouncement": "Announcement sent.", "savedAnnouncement": "Announcement saved.", @@ -186,7 +182,6 @@ "updateAppliedRefresh": "Update applied, please refresh.", "telegramVerified": "Telegram account verified.", "accountConnected": "Account connected.", - "error401Unauthorized": "Unauthorised. Try refreshing the page.", "errorSettingsAppliedNoHomescreenLayout": "Settings were applied, but applying homescreen layout may have failed.", "errorSaveEmail": "Failed to save email.", "errorLoadProfiles": "Failed to load profiles.", @@ -207,11 +202,10 @@ "saveEmail": "Email saved.", "createProfile": "Created profile {n}.", "saveSettings": "Settings were saved", - "errorConnection": "Couldn't connect to jfa-go.", "errorHomescreenAppliedNoSettings": "Homescreen layout was applied, but applying settings may have failed.", "errorBlankFields": "Fields were left blank", "errorSetDefaultProfile": "Failed to set default profile.", "errorChangedEmailAddress": "Couldn't change email address of {n}.", "updateAvailable": "A new update is available, check settings." } -} +} \ No newline at end of file diff --git a/lang/admin/en-us.json b/lang/admin/en-us.json index d5aa662..64512cc 100644 --- a/lang/admin/en-us.json +++ b/lang/admin/en-us.json @@ -15,8 +15,6 @@ "warning": "Warning", "inviteInfiniteUsesWarning": "invites with infinite uses can be used abusively", "inviteSendToEmail": "Send to", - "login": "Login", - "logout": "Logout", "create": "Create", "apply": "Apply", "delete": "Delete", @@ -139,13 +137,9 @@ "updateAppliedRefresh": "Update applied, please refresh.", "telegramVerified": "Telegram account verified.", "accountConnected": "Account connected.", - "errorConnection": "Couldn't connect to jfa-go.", - "error401Unauthorized": "Unauthorized. Try refreshing the page.", "errorSettingsAppliedNoHomescreenLayout": "Settings were applied, but applying homescreen layout may have failed.", "errorHomescreenAppliedNoSettings": "Homescreen layout was applied, but applying settings may have failed.", "errorSettingsFailed": "Application failed.", - "errorLoginBlank": "The username and/or password were left blank.", - "errorUnknown": "Unknown error.", "errorSaveEmail": "Failed to save email.", "errorBlankFields": "Fields were left blank", "errorDeleteProfile": "Failed to delete profile {n}", @@ -225,4 +219,4 @@ "plural": "Extended expiry for {n} users." } } -} +} \ No newline at end of file diff --git a/lang/admin/es-es.json b/lang/admin/es-es.json index cb872e0..253349c 100644 --- a/lang/admin/es-es.json +++ b/lang/admin/es-es.json @@ -15,8 +15,6 @@ "warning": "Advertencia", "inviteInfiniteUsesWarning": "Las invitaciones con usos infinitos se pueden usar de forma abusiva", "inviteSendToEmail": "Enviar a", - "login": "Acceso", - "logout": "Cerrar sesión", "create": "Crear", "apply": "Aplicar", "delete": "Eliminar", @@ -125,13 +123,9 @@ "sentAnnouncement": "Anuncio enviado.", "setOmbiDefaults": "Valores predeterminados de ombi almacenados.", "updateApplied": "Actualización aplicada, por favor reinicie.", - "errorConnection": "No se pudo conectar a jfa-go.", - "error401Unauthorized": "No autorizado. Intente actualizar la página.", "errorSettingsAppliedNoHomescreenLayout": "Se aplicó la configuración, pero es posible que no se haya aplicado el diseño de la pantalla de inicio.", "errorHomescreenAppliedNoSettings": "Se aplicó el diseño de la pantalla de inicio, pero es posible que la aplicación de la configuración haya fallado.", "errorSettingsFailed": "La aplicación falló.", - "errorLoginBlank": "El nombre de usuario y/o la contraseña se dejaron en blanco.", - "errorUnknown": "Error desconocido.", "errorSaveEmail": "No se pudo guardar el correo electrónico.", "errorBlankFields": "Los campos se dejaron en blanco", "errorDeleteProfile": "No se pudo borrar el perfil {n}", @@ -217,4 +211,4 @@ "plural": "Establecer la caducidad para {n} usuarios" } } -} +} \ No newline at end of file diff --git a/lang/admin/fr-fr.json b/lang/admin/fr-fr.json index 067333f..142fdca 100644 --- a/lang/admin/fr-fr.json +++ b/lang/admin/fr-fr.json @@ -15,8 +15,6 @@ "warning": "Attention", "inviteInfiniteUsesWarning": "les invitations infinies peuvent être utilisées abusivement", "inviteSendToEmail": "Envoyer à", - "login": "S'identifier", - "logout": "Se déconnecter", "create": "Créer", "apply": "Appliquer", "delete": "Effacer", @@ -123,13 +121,9 @@ "createProfile": "Profil créé {n}.", "saveSettings": "Les paramètres ont été enregistrés", "setOmbiDefaults": "Valeurs par défaut de Ombi.", - "errorConnection": "Impossible de se connecter à jfa-go.", - "error401Unauthorized": "Non autorisé. Essayez d'actualiser la page.", "errorSettingsAppliedNoHomescreenLayout": "Les paramètres ont été appliqués, mais l'application de la disposition de l'écran d'accueil a peut-être échoué.", "errorHomescreenAppliedNoSettings": "La disposition de l'écran d'accueil a été appliquée, mais l'application des paramètres a peut-être échoué.", "errorSettingsFailed": "L'application a échoué.", - "errorLoginBlank": "Le nom d'utilisateur et/ou le mot de passe sont vides.", - "errorUnknown": "Erreur inconnue.", "errorBlankFields": "Les champs sont vides", "errorDeleteProfile": "Échec de la suppression du profil {n}", "errorLoadProfiles": "Échec du chargement des profils.", @@ -218,4 +212,4 @@ "plural": "Définir l'expiration pour {n} utilisateurs" } } -} +} \ No newline at end of file diff --git a/lang/admin/hu-hu.json b/lang/admin/hu-hu.json index 12fd6bc..f439b09 100644 --- a/lang/admin/hu-hu.json +++ b/lang/admin/hu-hu.json @@ -15,8 +15,6 @@ "warning": "Figyelmeztetés", "inviteInfiniteUsesWarning": "a végtelen felhasználású meghívókkal visszaélhetnek", "inviteSendToEmail": "Címzett", - "login": "Belépés", - "logout": "Kijelentkezés", "create": "Létrehozás", "apply": "Alkalmaz", "delete": "Törlés", @@ -126,13 +124,9 @@ "updateAppliedRefresh": "", "telegramVerified": "", "accountConnected": "", - "errorConnection": "", - "error401Unauthorized": "", "errorSettingsAppliedNoHomescreenLayout": "", "errorHomescreenAppliedNoSettings": "", "errorSettingsFailed": "", - "errorLoginBlank": "", - "errorUnknown": "", "errorSaveEmail": "", "errorBlankFields": "", "errorDeleteProfile": "", @@ -208,4 +202,4 @@ "plural": "" } } -} +} \ No newline at end of file diff --git a/lang/admin/id-id.json b/lang/admin/id-id.json index 02ff93c..e77932f 100644 --- a/lang/admin/id-id.json +++ b/lang/admin/id-id.json @@ -13,8 +13,6 @@ "warning": "Peringatan", "inviteInfiniteUsesWarning": "Undangan dalam jumlah tak terbatas dapat disalahgunakan", "inviteSendToEmail": "Dikirim kepada", - "login": "Masuk", - "logout": "Keluar", "create": "Buat", "apply": "Terapkan", "delete": "Hapus", @@ -82,13 +80,9 @@ "createProfile": "Membuat profil {n}.", "saveSettings": "Pengaturan telah disimpan", "setOmbiDefaults": "Default ombi tersimpan.", - "errorConnection": "Tidak dapat terhubung ke jfa-go.", - "error401Unauthorized": "Tidak ter-otorisasi. Coba segarkan halaman.", "errorSettingsAppliedNoHomescreenLayout": "Pengaturan telah diterapkan, tetapi menerapkan tata letak layar utama mungkin gagal.", "errorHomescreenAppliedNoSettings": "Tata letak layar beranda diterapkan, tetapi menerapkan pengaturan mungkin gagal.", "errorSettingsFailed": "Aplikasi gagal.", - "errorLoginBlank": "Nama pengguna dan / atau sandi kosong.", - "errorUnknown": "Kesalahan yang tidak diketahui.", "errorBlankFields": "Isian dibiarkan kosong", "errorDeleteProfile": "Gagal menghapus profil {n}", "errorLoadProfiles": "Gagal memuat profil.", @@ -138,4 +132,4 @@ "plural": "Umumkan kepada {n} pengguna" } } -} +} \ No newline at end of file diff --git a/lang/admin/nl-nl.json b/lang/admin/nl-nl.json index 1d61a4c..ff4e71b 100644 --- a/lang/admin/nl-nl.json +++ b/lang/admin/nl-nl.json @@ -13,8 +13,6 @@ "warning": "Waarschuwing", "inviteInfiniteUsesWarning": "ongelimiteerde uitnodigingen kunnen misbruikt worden", "inviteSendToEmail": "Stuur naar", - "login": "Inloggen", - "logout": "Uitloggen", "create": "Aanmaken", "apply": "Toepassen", "delete": "Verwijderen", @@ -122,13 +120,9 @@ "createProfile": "Profiel {n} aangemaakt.", "saveSettings": "De instellingen zijn opgeslagen", "setOmbiDefaults": "De ombi standaardinstellingen zijn opgeslagen.", - "errorConnection": "Kon geen verbinding maken met jfa-go.", - "error401Unauthorized": "Geen toegang. Probeer de pagina te vernieuwen.", "errorSettingsAppliedNoHomescreenLayout": "De instellingen zijn toegepast, maar wijzigen van de startpaginaindeling is misschien mislukt.", "errorHomescreenAppliedNoSettings": "Startpaginaindeling toegepast, maar opslaan van instellingen is misschien mislukt.", "errorSettingsFailed": "Opslaan mislukt.", - "errorLoginBlank": "De gebruikersnaam en/of wachtwoord is leeg.", - "errorUnknown": "Onbekende fout.", "errorBlankFields": "Velden leeggelaten", "errorDeleteProfile": "Verwijderen van profiel {n} mislukt", "errorLoadProfiles": "Fout bij het laden van profielen.", @@ -217,4 +211,4 @@ "plural": "Stel verloop in voor {n} gebruikers" } } -} +} \ No newline at end of file diff --git a/lang/admin/pl-PL.json b/lang/admin/pl-pl.json similarity index 96% rename from lang/admin/pl-PL.json rename to lang/admin/pl-pl.json index 1cd862b..054448d 100644 --- a/lang/admin/pl-PL.json +++ b/lang/admin/pl-pl.json @@ -15,8 +15,6 @@ "warning": "Ostrzeżenie", "inviteInfiniteUsesWarning": "", "inviteSendToEmail": "", - "login": "", - "logout": "", "create": "", "apply": "", "delete": "", @@ -128,13 +126,9 @@ "updateAppliedRefresh": "Aktualizacja zastosowana, odśwież.", "telegramVerified": "Konto telegramu zweryfikowane.", "accountConnected": "Konto połączone.", - "errorConnection": "Nie udało się połączyć z jfa-go.", - "error401Unauthorized": "Nieautoryzowany. Spróbuj odświeżyć stronę.", "errorSettingsAppliedNoHomescreenLayout": "Zastosowano ustawienia, ale zastosowanie układu ekranu głównego mogło się nie powieść.", "errorHomescreenAppliedNoSettings": "", "errorSettingsFailed": "", - "errorLoginBlank": "", - "errorUnknown": "Nieznany błąd.", "errorSaveEmail": "", "errorBlankFields": "", "errorDeleteProfile": "", @@ -214,4 +208,4 @@ "plural": "" } } -} +} \ No newline at end of file diff --git a/lang/admin/pt-br.json b/lang/admin/pt-br.json index 49e9dc8..a4017be 100644 --- a/lang/admin/pt-br.json +++ b/lang/admin/pt-br.json @@ -13,8 +13,6 @@ "warning": "Aviso", "inviteInfiniteUsesWarning": "convites infinitos podem ser usados de forma abusiva", "inviteSendToEmail": "Enviar para", - "login": "Login", - "logout": "Sair", "create": "Criar", "apply": "Aplicar", "delete": "Deletar", @@ -122,13 +120,9 @@ "createProfile": "Perfil {n} criado.", "saveSettings": "As configurações foram salvas", "setOmbiDefaults": "Padrões do ombi armazenados.", - "errorConnection": "Não foi possível conectar ao jfa-go.", - "error401Unauthorized": "Não autorizado. Tente atualizar a página.", "errorSettingsAppliedNoHomescreenLayout": "As configurações foram aplicadas, mas a aplicação do layout da tela inicial pode ter falhado.", "errorHomescreenAppliedNoSettings": "O layout da tela inicial foi aplicado, mas a aplicação das configurações pode ter falhado.", "errorSettingsFailed": "Falha na aplicação.", - "errorLoginBlank": "O nome de usuário e/ou senha foram deixados em branco.", - "errorUnknown": "Erro desconhecido.", "errorBlankFields": "Os campos foram deixados em branco", "errorDeleteProfile": "Falha ao excluir perfil {n}", "errorLoadProfiles": "Falha ao carregar perfis.", @@ -217,4 +211,4 @@ "plural": "Definir expiração para {a} usuários" } } -} +} \ No newline at end of file diff --git a/lang/admin/sv-se.json b/lang/admin/sv-se.json index 551cab5..2996d70 100644 --- a/lang/admin/sv-se.json +++ b/lang/admin/sv-se.json @@ -13,8 +13,6 @@ "warning": "Varning", "inviteInfiniteUsesWarning": "inbjudningar med oändligt antal användningar kan missbrukas", "inviteSendToEmail": "Skicka till", - "login": "Logga in", - "logout": "Logga ut", "create": "Skapa", "apply": "Tillämpa", "delete": "Radera", @@ -92,13 +90,9 @@ "saveEmail": "E-post sparad.", "sentAnnouncement": "Meddelande skickat.", "setOmbiDefaults": "Lagrade ombi-standardvärden.", - "errorConnection": "Det gick inte att ansluta till jfa-go.", - "error401Unauthorized": "Obehörig. Prova att uppdatera sidan.", "errorSettingsAppliedNoHomescreenLayout": "Inställningarna tillämpades, men tillämpningen av hemskärmslayout kan ha misslyckats.", "errorHomescreenAppliedNoSettings": "Hemskärmslayout tillämpades, men tillämpningen av inställningar kan ha misslyckats.", "errorSettingsFailed": "Tillämpning misslyckades.", - "errorLoginBlank": "Användarnamnet och/eller lösenordet lämnades tomt.", - "errorUnknown": "Okänt fel.", "errorSaveEmail": "Det gick inte att spara e-postmeddelandet.", "errorBlankFields": "Fält lämnades tomma", "errorDeleteProfile": "Det gick inte att ta bort profilen {n}", @@ -154,4 +148,4 @@ "plural": "Utökad giltighetstid för {n} användare." } } -} +} \ No newline at end of file diff --git a/lang/admin/vi-vn.json b/lang/admin/vi-vn.json index 86b4986..c3d4930 100644 --- a/lang/admin/vi-vn.json +++ b/lang/admin/vi-vn.json @@ -15,8 +15,6 @@ "warning": "Cảnh báo", "inviteInfiniteUsesWarning": "các lời mời không giới hạn số lần sử dụng có thể bị lạm dụng", "inviteSendToEmail": "Gửi tới", - "login": "Đăng nhập", - "logout": "Đăng xuất", "create": "Tạo mới", "apply": "Áp dụng", "delete": "Xóa", @@ -127,13 +125,9 @@ "updateAppliedRefresh": "Cập nhật mới đã được áp dụng, vui lòng làm mới lại trang.", "telegramVerified": "Tài khoản Telegram đã được xác thực.", "accountConnected": "Tài khoản đã được kết nối.", - "errorConnection": "Không thể kết nối với jfa-go.", - "error401Unauthorized": "Không được phép. Hãy thử làm mới trang.", "errorSettingsAppliedNoHomescreenLayout": "Cài đặt đã được áp dụng, nhưng việc áp dụng bố cục màn hình chính có thể không thành công.", "errorHomescreenAppliedNoSettings": "", "errorSettingsFailed": "", - "errorLoginBlank": "", - "errorUnknown": "", "errorSaveEmail": "", "errorBlankFields": "", "errorDeleteProfile": "", @@ -209,4 +203,4 @@ "plural": "" } } -} +} \ No newline at end of file diff --git a/lang/admin/zh-hans.json b/lang/admin/zh-hans.json index 37ed268..7460242 100644 --- a/lang/admin/zh-hans.json +++ b/lang/admin/zh-hans.json @@ -15,8 +15,6 @@ "warning": "警告", "inviteInfiniteUsesWarning": "无限使用次数的邀请码可能被滥用", "inviteSendToEmail": "发送到", - "login": "登录", - "logout": "登出", "create": "创建", "apply": "申请", "delete": "删除", @@ -129,13 +127,9 @@ "updateAppliedRefresh": "已应用更新，请刷新。", "telegramVerified": "Telegram账户已验证。", "accountConnected": "帐户已连接。", - "errorConnection": "无法连接到 jfa-go。", - "error401Unauthorized": "无授权。尝试刷新页面。", "errorSettingsAppliedNoHomescreenLayout": "已应用设置，但应用主屏幕布局可能失败。", "errorHomescreenAppliedNoSettings": "已应用主屏幕布局，但应用设置可能失败。", "errorSettingsFailed": "应用失败。", - "errorLoginBlank": "用户名/密码留空。", - "errorUnknown": "未知错误。", "errorSaveEmail": "电子邮箱保存失败。", "errorBlankFields": "字段留空", "errorDeleteProfile": "删除配置文件{n}失败", @@ -217,4 +211,4 @@ "singular": "为{n}用户设置到期时间" } } -} +} \ No newline at end of file diff --git a/lang/admin/zh-Hant.json b/lang/admin/zh-hant.json similarity index 97% rename from lang/admin/zh-Hant.json rename to lang/admin/zh-hant.json index 65f1b48..b935390 100644 --- a/lang/admin/zh-Hant.json +++ b/lang/admin/zh-hant.json @@ -15,8 +15,6 @@ "warning": "警告", "inviteInfiniteUsesWarning": "無限使用次數的邀請碼可能被濫用", "inviteSendToEmail": "發送到", - "login": "登錄", - "logout": "登出", "create": "創建", "apply": "應用", "delete": "刪除", @@ -128,13 +126,9 @@ "updateAppliedRefresh": "更新已應用，請重新整理。", "telegramVerified": "Telegram 帳戶已驗證。", "accountConnected": "帳戶已連接。", - "errorConnection": "無法連接到 jfa-go。", - "error401Unauthorized": "未經授權。嘗試重新整理頁面。", "errorSettingsAppliedNoHomescreenLayout": "已應用設置，但應用主螢幕佈局可能失敗。", "errorHomescreenAppliedNoSettings": "已應用主螢幕佈局，但應用設置可能失敗。", "errorSettingsFailed": "應用失敗。", - "errorLoginBlank": "帳戶名稱和/或密碼留空。", - "errorUnknown": "未知的錯誤。", "errorSaveEmail": "無法儲存電子郵件。", "errorBlankFields": "欄位留空", "errorDeleteProfile": "無法刪除設置文件 {n}", @@ -214,4 +208,4 @@ "plural": "已延長 {n} 個帳戶的到期時間。" } } -} +} \ No newline at end of file diff --git a/lang/common/ar-aa.json b/lang/common/ar-aa.json new file mode 100644 index 0000000..b472463 --- /dev/null +++ b/lang/common/ar-aa.json @@ -0,0 +1,7 @@ +{ + "meta": { + "name": "العربية (AR)" + }, + "strings": {}, + "notifications": {} +} \ No newline at end of file diff --git a/lang/common/da-dk.json b/lang/common/da-dk.json index 71ea5c1..8928254 100644 --- a/lang/common/da-dk.json +++ b/lang/common/da-dk.json @@ -24,6 +24,14 @@ "contactDiscord": "Kontakt gennem Discord", "theme": "Tema", "refresh": "Opdater", - "required": "Påkrævet" + "required": "Påkrævet", + "login": "Log på", + "logout": "Log ud" + }, + "notifications": { + "errorLoginBlank": "Brugernavnet og/eller adgangskoden blev efterladt tomme.", + "errorConnection": "Kunne ikke oprette forbindelse til jfa-go.", + "errorUnknown": "Ukendt fejl.", + "error401Unauthorized": "Adgang nægtet. Prøv at genindlæse siden." } -} +} \ No newline at end of file diff --git a/lang/common/de-de.json b/lang/common/de-de.json index 6beccf2..c5413a6 100644 --- a/lang/common/de-de.json +++ b/lang/common/de-de.json @@ -4,26 +4,34 @@ }, "strings": { "username": "Benutzername", - "name": "Name", "password": "Passwort", "emailAddress": "E-Mail Adresse", + "name": "Name", "submit": "Absenden", + "send": "Senden", "success": "Erfolgreich", "continue": "Weiter", "error": "Fehler", "copy": "Kopieren", - "theme": "Thema", + "copied": "Kopiert", "time24h": "24h-Format", "time12h": "12h-Format", - "copied": "Kopiert", "linkTelegram": "Link Telegram", "contactEmail": "Kontakt über E-Mail", "contactTelegram": "Kontakt über Telegram", "linkDiscord": "Link Discord", "linkMatrix": "Link Matrix", - "send": "Senden", "contactDiscord": "Kontakt über Discord", + "theme": "Thema", "refresh": "Aktualisieren", - "required": "Erforderlich" + "required": "Erforderlich", + "login": "Anmelden", + "logout": "Abmelden" + }, + "notifications": { + "errorLoginBlank": "Der Benutzername und/oder das Passwort wurden nicht ausgefüllt.", + "errorConnection": "Konnte keine Verbindung zu jfa-go herstellen.", + "errorUnknown": "Unbekannter Fehler.", + "error401Unauthorized": "Unberechtigt. Versuch, die Seite zu aktualisieren." } -} +} \ No newline at end of file diff --git a/lang/common/el-gr.json b/lang/common/el-gr.json index 94d5c4f..b2e2cb4 100644 --- a/lang/common/el-gr.json +++ b/lang/common/el-gr.json @@ -12,9 +12,17 @@ "continue": "Συνέχεια", "error": "Σφάλμα", "copy": "Αντιγραφή", - "theme": "Θέμα", + "copied": "Αντιγράφηκε", "time24h": "24 Ώρες", "time12h": "12 Ώρες", - "copied": "Αντιγράφηκε" + "theme": "Θέμα", + "login": "Σύνδεση", + "logout": "Αποσύνδεση" + }, + "notifications": { + "errorLoginBlank": "Το όνομα χρήστη και/ή ο κωδικός ήταν κενά.", + "errorConnection": "Δεν μπόρεσε να συνδεθεί με το jfa-go.", + "errorUnknown": "Άγνωστο σφάλμα.", + "error401Unauthorized": "Ανεξουσιοδότητος. Προσπαθήστε να κάνετε επαναφόρτωση την σελίδα." } -} +} \ No newline at end of file diff --git a/lang/common/en-gb.json b/lang/common/en-gb.json index 0bcc3da..bb1de9f 100644 --- a/lang/common/en-gb.json +++ b/lang/common/en-gb.json @@ -3,27 +3,35 @@ "name": "English (GB)" }, "strings": { - "continue": "Continue", - "time24h": "24h Time", - "linkTelegram": "Link Telegram", - "send": "Send", - "linkDiscord": "Link Discord", - "linkMatrix": "Link Matrix", - "contactDiscord": "Contact through Discord", "username": "Username", "password": "Password", "emailAddress": "Email Address", + "name": "Name", + "submit": "Submit", + "send": "Send", + "success": "Success", + "continue": "Continue", + "error": "Error", "copy": "Copy", "copied": "Copied", - "submit": "Submit", - "success": "Success", - "error": "Error", + "time24h": "24h Time", "time12h": "12h Time", - "theme": "Theme", + "linkTelegram": "Link Telegram", "contactEmail": "Contact through Email", "contactTelegram": "Contact through Telegram", - "name": "Name", + "linkDiscord": "Link Discord", + "linkMatrix": "Link Matrix", + "contactDiscord": "Contact through Discord", + "theme": "Theme", "refresh": "Refresh", - "required": "Required" + "required": "Required", + "login": "Login", + "logout": "Logout" + }, + "notifications": { + "errorLoginBlank": "The username and/or password was left blank.", + "errorConnection": "Couldn't connect to jfa-go.", + "errorUnknown": "Unknown error.", + "error401Unauthorized": "Unauthorised. Try refreshing the page." } -} +} \ No newline at end of file diff --git a/lang/common/en-us.json b/lang/common/en-us.json index 761ff44..ac80cc3 100644 --- a/lang/common/en-us.json +++ b/lang/common/en-us.json @@ -24,6 +24,14 @@ "contactDiscord": "Contact through Discord", "theme": "Theme", "refresh": "Refresh", - "required": "Required" + "required": "Required", + "login": "Login", + "logout": "Logout" + }, + "notifications": { + "errorLoginBlank": "The username and/or password were left blank.", + "errorConnection": "Couldn't connect to jfa-go.", + "errorUnknown": "Unknown error.", + "error401Unauthorized": "Unauthorized. Try refreshing the page." } -} +} \ No newline at end of file diff --git a/lang/common/es-es.json b/lang/common/es-es.json index dd31b2e..c20c3fe 100644 --- a/lang/common/es-es.json +++ b/lang/common/es-es.json @@ -8,6 +8,7 @@ "emailAddress": "Correo electrónico", "name": "Nombre", "submit": "Enviar", + "send": "Enviar", "success": "Éxito", "continue": "Continuar", "error": "Error", @@ -15,15 +16,22 @@ "copied": "Copiado", "time24h": "Formato de 24 horas", "time12h": "Formato de 12 horas", - "theme": "Tema", - "send": "Enviar", - "contactDiscord": "Contactar por Discord", + "linkTelegram": "Enlace Telegram", "contactEmail": "Contactar por correo electrónico", "contactTelegram": "Contactar por Telegram", - "linkMatrix": "Enlace Matrix", "linkDiscord": "Enlace Discord", - "linkTelegram": "Enlace Telegram", + "linkMatrix": "Enlace Matrix", + "contactDiscord": "Contactar por Discord", + "theme": "Tema", "refresh": "Refrescar", - "required": "Requerido" + "required": "Requerido", + "login": "Acceso", + "logout": "Cerrar sesión" + }, + "notifications": { + "errorLoginBlank": "El nombre de usuario y/o la contraseña se dejaron en blanco.", + "errorConnection": "No se pudo conectar a jfa-go.", + "errorUnknown": "Error desconocido.", + "error401Unauthorized": "No autorizado. Intente actualizar la página." } -} +} \ No newline at end of file diff --git a/lang/common/fa-ir.json b/lang/common/fa-ir.json index 0931d08..612fc27 100644 --- a/lang/common/fa-ir.json +++ b/lang/common/fa-ir.json @@ -23,5 +23,6 @@ "linkMatrix": "پیوند ماتریکس", "contactDiscord": "از طریق دیسکورد تماس بگیرید", "theme": "موضوع" - } -} + }, + "notifications": {} +} \ No newline at end of file diff --git a/lang/common/fr-fr.json b/lang/common/fr-fr.json index 9a97f1c..a47a19f 100644 --- a/lang/common/fr-fr.json +++ b/lang/common/fr-fr.json @@ -1,30 +1,37 @@ { "meta": { - "name": "Français (FR)", - "author": "https://github.com/Killianbe" + "name": "Français (FR)" }, "strings": { "username": "Nom d'utilisateur", - "name": "Nom", "password": "Mot de passe", "emailAddress": "Adresse e-mail", + "name": "Nom", "submit": "Soumettre", + "send": "Envoyer", "success": "Succès", "continue": "Continuer", "error": "Erreur", "copy": "Copier", + "copied": "Copié", "time24h": "Temps 24h", "time12h": "Temps 12h", - "theme": "Thème", - "copied": "Copié", "linkTelegram": "Lien Telegram", "contactEmail": "Contact par e-mail", "contactTelegram": "Contact par Telegram", "linkDiscord": "Lier Discord", "linkMatrix": "Lier Matrix", - "send": "Envoyer", "contactDiscord": "Contacter par Discord", + "theme": "Thème", "refresh": "Actualiser", - "required": "Requis" + "required": "Requis", + "login": "S'identifier", + "logout": "Se déconnecter" + }, + "notifications": { + "errorLoginBlank": "Le nom d'utilisateur et/ou le mot de passe sont vides.", + "errorConnection": "Impossible de se connecter à jfa-go.", + "errorUnknown": "Erreur inconnue.", + "error401Unauthorized": "Non autorisé. Essayez d'actualiser la page." } -} +} \ No newline at end of file diff --git a/lang/common/hu-hu.json b/lang/common/hu-hu.json new file mode 100644 index 0000000..7758357 --- /dev/null +++ b/lang/common/hu-hu.json @@ -0,0 +1,10 @@ +{ + "meta": { + "name": "English (US)" + }, + "strings": { + "login": "Belépés", + "logout": "Kijelentkezés" + }, + "notifications": {} +} \ No newline at end of file diff --git a/lang/common/id-id.json b/lang/common/id-id.json index a5a7c2f..71a1691 100644 --- a/lang/common/id-id.json +++ b/lang/common/id-id.json @@ -8,6 +8,7 @@ "emailAddress": "Alamat Email", "name": "Nama", "submit": "Submit", + "send": "Kirim", "success": "Sukses", "continue": "Lanjut", "error": "Error", @@ -15,6 +16,13 @@ "time24h": "Waktu 24 jam", "time12h": "Waktu 12 jam", "theme": "Tema", - "send": "Kirim" + "login": "Masuk", + "logout": "Keluar" + }, + "notifications": { + "errorLoginBlank": "Nama pengguna dan / atau sandi kosong.", + "errorConnection": "Tidak dapat terhubung ke jfa-go.", + "errorUnknown": "Kesalahan yang tidak diketahui.", + "error401Unauthorized": "Tidak ter-otorisasi. Coba segarkan halaman." } -} +} \ No newline at end of file diff --git a/lang/common/it-IT.json b/lang/common/it-it.json similarity index 96% rename from lang/common/it-IT.json rename to lang/common/it-it.json index b2cbf0d..1576a7b 100644 --- a/lang/common/it-IT.json +++ b/lang/common/it-it.json @@ -25,5 +25,6 @@ "theme": "Tema", "refresh": "Aggiorna", "required": "Richiesto" - } -} + }, + "notifications": {} +} \ No newline at end of file diff --git a/lang/common/nl-nl.json b/lang/common/nl-nl.json index 099cfb4..5e0e141 100644 --- a/lang/common/nl-nl.json +++ b/lang/common/nl-nl.json @@ -4,26 +4,34 @@ }, "strings": { "username": "Gebruikersnaam", - "name": "Naam", "password": "Wachtwoord", "emailAddress": "E-mailadres", + "name": "Naam", "submit": "Verstuur", + "send": "Verstuur", "success": "Succes", "continue": "Doorgaan", "error": "Fout", "copy": "Kopiëer", - "theme": "Thema", + "copied": "Gekopieerd", "time24h": "24u-formaat", "time12h": "12u-formaat", - "copied": "Gekopieerd", "linkTelegram": "Koppel Telegram", "contactEmail": "Stuur e-mailbericht", "contactTelegram": "Stuur Telegram-bericht", - "send": "Verstuur", "linkDiscord": "Koppel Discord", "linkMatrix": "Koppel Matrix", "contactDiscord": "Stuur Discord bericht", + "theme": "Thema", "refresh": "Ververs", - "required": "Verplicht" + "required": "Verplicht", + "login": "Inloggen", + "logout": "Uitloggen" + }, + "notifications": { + "errorLoginBlank": "De gebruikersnaam en/of wachtwoord is leeg.", + "errorConnection": "Kon geen verbinding maken met jfa-go.", + "errorUnknown": "Onbekende fout.", + "error401Unauthorized": "Geen toegang. Probeer de pagina te vernieuwen." } -} +} \ No newline at end of file diff --git a/lang/common/pl-PL.json b/lang/common/pl-pl.json similarity index 78% rename from lang/common/pl-PL.json rename to lang/common/pl-pl.json index 307ee1f..880f08e 100644 --- a/lang/common/pl-PL.json +++ b/lang/common/pl-pl.json @@ -25,5 +25,10 @@ "theme": "Motyw", "refresh": "Odśwież", "required": "Wymagane" + }, + "notifications": { + "errorConnection": "Nie udało się połączyć z jfa-go.", + "errorUnknown": "Nieznany błąd.", + "error401Unauthorized": "Nieautoryzowany. Spróbuj odświeżyć stronę." } -} +} \ No newline at end of file diff --git a/lang/common/pt-br.json b/lang/common/pt-br.json index 7d9b7b8..cc5ec2c 100644 --- a/lang/common/pt-br.json +++ b/lang/common/pt-br.json @@ -4,26 +4,34 @@ }, "strings": { "username": "Nome do Usuário", - "name": "Nome", "password": "Senha", "emailAddress": "Endereço de e-mail", + "name": "Nome", "submit": "Enviar", + "send": "Enviar", "success": "Sucesso", "continue": "Continuar", "error": "Erro", "copy": "Copiar", - "theme": "Tema", + "copied": "Copiado", "time24h": "Horário 24h", "time12h": "Horário 12h", - "copied": "Copiado", "linkTelegram": "Link do Telegram", "contactEmail": "Contato por Email", "contactTelegram": "Contato pelo Telegram", - "send": "Enviar", "linkDiscord": "Link do Discord", "linkMatrix": "Link do Matrix", "contactDiscord": "Contato através do Discord", + "theme": "Tema", "refresh": "Atualizar", - "required": "Requeridos" + "required": "Requeridos", + "login": "Login", + "logout": "Sair" + }, + "notifications": { + "errorLoginBlank": "O nome de usuário e/ou senha foram deixados em branco.", + "errorConnection": "Não foi possível conectar ao jfa-go.", + "errorUnknown": "Erro desconhecido.", + "error401Unauthorized": "Não autorizado. Tente atualizar a página." } -} +} \ No newline at end of file diff --git a/lang/common/ro-ro.json b/lang/common/ro-ro.json new file mode 100644 index 0000000..8bf759e --- /dev/null +++ b/lang/common/ro-ro.json @@ -0,0 +1,7 @@ +{ + "meta": { + "name": "Română (ROU)" + }, + "strings": {}, + "notifications": {} +} \ No newline at end of file diff --git a/lang/common/sl-si.json b/lang/common/sl-si.json index 0548ef7..5980f6a 100644 --- a/lang/common/sl-si.json +++ b/lang/common/sl-si.json @@ -25,5 +25,6 @@ "theme": "Tema", "refresh": "Osveži", "required": "Obvezno" - } -} + }, + "notifications": {} +} \ No newline at end of file diff --git a/lang/common/sv-se.json b/lang/common/sv-se.json index 3354ca4..e1285d1 100644 --- a/lang/common/sv-se.json +++ b/lang/common/sv-se.json @@ -14,6 +14,14 @@ "copy": "Kopiera", "time24h": "24 timmarsklocka", "time12h": "12 timmarsklocka", - "theme": "Tema" + "theme": "Tema", + "login": "Logga in", + "logout": "Logga ut" + }, + "notifications": { + "errorLoginBlank": "Användarnamnet och/eller lösenordet lämnades tomt.", + "errorConnection": "Det gick inte att ansluta till jfa-go.", + "errorUnknown": "Okänt fel.", + "error401Unauthorized": "Obehörig. Prova att uppdatera sidan." } -} +} \ No newline at end of file diff --git a/lang/common/vi-vn.json b/lang/common/vi-vn.json new file mode 100644 index 0000000..78959fe --- /dev/null +++ b/lang/common/vi-vn.json @@ -0,0 +1,13 @@ +{ + "meta": { + "name": "Tiếng Anh (Mỹ)" + }, + "strings": { + "login": "Đăng nhập", + "logout": "Đăng xuất" + }, + "notifications": { + "errorConnection": "Không thể kết nối với jfa-go.", + "error401Unauthorized": "Không được phép. Hãy thử làm mới trang." + } +} \ No newline at end of file diff --git a/lang/common/zh-hans.json b/lang/common/zh-hans.json index d67af52..fa2b4da 100644 --- a/lang/common/zh-hans.json +++ b/lang/common/zh-hans.json @@ -24,6 +24,14 @@ "contactDiscord": "通过Discord联系", "theme": "主题", "refresh": "刷新", - "required": "必需的" + "required": "必需的", + "login": "登录", + "logout": "登出" + }, + "notifications": { + "errorLoginBlank": "用户名/密码留空。", + "errorConnection": "无法连接到 jfa-go。", + "errorUnknown": "未知错误。", + "error401Unauthorized": "无授权。尝试刷新页面。" } -} +} \ No newline at end of file diff --git a/lang/common/zh-Hant.json b/lang/common/zh-hant.json similarity index 69% rename from lang/common/zh-Hant.json rename to lang/common/zh-hant.json index c3a51ce..f80852e 100644 --- a/lang/common/zh-Hant.json +++ b/lang/common/zh-hant.json @@ -24,6 +24,14 @@ "contactDiscord": "通過 Discord 聯繫", "theme": "主題", "refresh": "重新整理", - "required": "必填" + "required": "必填", + "login": "登錄", + "logout": "登出" + }, + "notifications": { + "errorLoginBlank": "帳戶名稱和/或密碼留空。", + "errorConnection": "無法連接到 jfa-go。", + "errorUnknown": "未知的錯誤。", + "error401Unauthorized": "未經授權。嘗試重新整理頁面。" } -} +} \ No newline at end of file diff --git a/lang/email/da-dk.json b/lang/email/da-dk.json index 40320e4..86f660c 100644 --- a/lang/email/da-dk.json +++ b/lang/email/da-dk.json @@ -74,4 +74,4 @@ "yourAccountHasExpired": "Din konto er udløbet.", "contactTheAdmin": "Kontakt administratoren for mere information." } -} +} \ No newline at end of file diff --git a/lang/email/de-de.json b/lang/email/de-de.json index a817d89..5754559 100644 --- a/lang/email/de-de.json +++ b/lang/email/de-de.json @@ -74,4 +74,4 @@ "title": "Dein Konto wurde wieder freigeschaltet - Jellyfin", "yourAccountWasEnabled": "Dein Konto wurde wieder aktiviert." } -} +} \ No newline at end of file diff --git a/lang/email/el-gr.json b/lang/email/el-gr.json index 20c7e2c..1b78404 100644 --- a/lang/email/el-gr.json +++ b/lang/email/el-gr.json @@ -74,4 +74,4 @@ "name": "Ο χρήστης ενεργοποιήθηκε", "yourAccountWasEnabled": "Ο λογαριασμός σας ενεργοποιήθηκε εκ νέου." } -} +} \ No newline at end of file diff --git a/lang/email/en-gb.json b/lang/email/en-gb.json index 3e367ef..696358e 100644 --- a/lang/email/en-gb.json +++ b/lang/email/en-gb.json @@ -74,4 +74,4 @@ "title": "Your account has been re-enabled - Jellyfin", "yourAccountWasEnabled": "Your account was re-enabled." } -} +} \ No newline at end of file diff --git a/lang/email/en-us.json b/lang/email/en-us.json index 2bc8698..0f00b2b 100644 --- a/lang/email/en-us.json +++ b/lang/email/en-us.json @@ -74,4 +74,4 @@ "yourAccountHasExpired": "Your account has expired.", "contactTheAdmin": "Contact the administrator for more info." } -} +} \ No newline at end of file diff --git a/lang/email/es-es.json b/lang/email/es-es.json index 974d068..8a51ce7 100644 --- a/lang/email/es-es.json +++ b/lang/email/es-es.json @@ -74,4 +74,4 @@ "yourAccountHasExpired": "Tu cuenta ha expirado.", "contactTheAdmin": "Póngase en contacto con el administrador para obtener más información." } -} +} \ No newline at end of file diff --git a/lang/email/fr-fr.json b/lang/email/fr-fr.json index 465f9a4..d3b92db 100644 --- a/lang/email/fr-fr.json +++ b/lang/email/fr-fr.json @@ -75,4 +75,4 @@ "title": "Ton compte a été ré-activé - Jellyfin", "yourAccountWasEnabled": "Ton compte a été ré-activé." } -} +} \ No newline at end of file diff --git a/lang/email/id-id.json b/lang/email/id-id.json index eccfda3..4c1e558 100644 --- a/lang/email/id-id.json +++ b/lang/email/id-id.json @@ -56,4 +56,4 @@ "confirmEmail": "Konfirmasi Email", "name": "Email konfirmasi" } -} +} \ No newline at end of file diff --git a/lang/email/it-it.json b/lang/email/it-it.json index 4389810..b51e5ae 100644 --- a/lang/email/it-it.json +++ b/lang/email/it-it.json @@ -49,4 +49,4 @@ "clickBelow": "", "confirmEmail": "" } -} +} \ No newline at end of file diff --git a/lang/email/nl-nl.json b/lang/email/nl-nl.json index c93f3a6..90d9036 100644 --- a/lang/email/nl-nl.json +++ b/lang/email/nl-nl.json @@ -74,4 +74,4 @@ "name": "Gebruiker ingeschakeld", "title": "Je account is opnieuw ingeschakeld - Jellyfin" } -} +} \ No newline at end of file diff --git a/lang/email/pl-PL.json b/lang/email/pl-pl.json similarity index 99% rename from lang/email/pl-PL.json rename to lang/email/pl-pl.json index 9730d83..98306f0 100644 --- a/lang/email/pl-PL.json +++ b/lang/email/pl-pl.json @@ -74,4 +74,4 @@ "yourAccountHasExpired": "Twoje konto wygasło.", "contactTheAdmin": "Skontaktuj się z administratorem aby uzyskać więcej szczegółów." } -} +} \ No newline at end of file diff --git a/lang/email/pt-br.json b/lang/email/pt-br.json index c3048b3..dcdca77 100644 --- a/lang/email/pt-br.json +++ b/lang/email/pt-br.json @@ -74,4 +74,4 @@ "name": "Usuário ativado", "yourAccountWasEnabled": "Sua conta foi reativada." } -} +} \ No newline at end of file diff --git a/lang/email/ro-RO.json b/lang/email/ro-ro.json similarity index 99% rename from lang/email/ro-RO.json rename to lang/email/ro-ro.json index 626c804..fb7a814 100644 --- a/lang/email/ro-RO.json +++ b/lang/email/ro-ro.json @@ -74,4 +74,4 @@ "yourAccountHasExpired": "Contul dvs. a expirat.", "contactTheAdmin": "Contactați administratorul pentru mai multe informații." } -} +} \ No newline at end of file diff --git a/lang/email/sv-se.json b/lang/email/sv-se.json index d37450f..8bf92bd 100644 --- a/lang/email/sv-se.json +++ b/lang/email/sv-se.json @@ -62,4 +62,4 @@ "yourAccountHasExpired": "Ditt konto har gått ut.", "contactTheAdmin": "Kontakta administratören för mer information." } -} +} \ No newline at end of file diff --git a/lang/email/zh-hans.json b/lang/email/zh-hans.json index 8f0f4dd..cd56cb0 100644 --- a/lang/email/zh-hans.json +++ b/lang/email/zh-hans.json @@ -74,4 +74,4 @@ "yourAccountHasExpired": "您的账号已过期。", "contactTheAdmin": "请联系管理员了解更多信息。" } -} +} \ No newline at end of file diff --git a/lang/email/zh-Hant.json b/lang/email/zh-hant.json similarity index 99% rename from lang/email/zh-Hant.json rename to lang/email/zh-hant.json index 7bba06f..e103ccc 100644 --- a/lang/email/zh-Hant.json +++ b/lang/email/zh-hant.json @@ -74,4 +74,4 @@ "yourAccountHasExpired": "您的帳號已過期。", "contactTheAdmin": "請聯繫管理員瞭解更多資訊。" } -} +} \ No newline at end of file diff --git a/lang/form/ar-aa.json b/lang/form/ar-aa.json index 2ca2131..9ec9140 100644 --- a/lang/form/ar-aa.json +++ b/lang/form/ar-aa.json @@ -59,4 +59,4 @@ "plural": "يجب أن يتألف من {n} حرف خاص على الأقل" } } -} +} \ No newline at end of file diff --git a/lang/form/da-dk.json b/lang/form/da-dk.json index 90f18ed..efbeb5b 100644 --- a/lang/form/da-dk.json +++ b/lang/form/da-dk.json @@ -57,4 +57,4 @@ "plural": "Skal mindst have {n} specialtegn" } } -} +} \ No newline at end of file diff --git a/lang/form/de-de.json b/lang/form/de-de.json index 005fb41..5d73fcb 100644 --- a/lang/form/de-de.json +++ b/lang/form/de-de.json @@ -58,4 +58,4 @@ "errorPassword": "Prüfe die Passwortanforderungen.", "errorNoMatch": "Passwörter stimmen nicht überein." } -} +} \ No newline at end of file diff --git a/lang/form/el-gr.json b/lang/form/el-gr.json index 8301ad3..03fcc2a 100644 --- a/lang/form/el-gr.json +++ b/lang/form/el-gr.json @@ -44,4 +44,4 @@ "plural": "Πρέπει να περιέχει τουλάχιστον {n} ειδικούς χαρακτήρες" } } -} +} \ No newline at end of file diff --git a/lang/form/en-gb.json b/lang/form/en-gb.json index c165ce1..b10b0f2 100644 --- a/lang/form/en-gb.json +++ b/lang/form/en-gb.json @@ -57,4 +57,4 @@ "plural": "Must have at least {n} lowercase characters" } } -} +} \ No newline at end of file diff --git a/lang/form/en-us.json b/lang/form/en-us.json index bb64683..57b680c 100644 --- a/lang/form/en-us.json +++ b/lang/form/en-us.json @@ -19,7 +19,8 @@ "yourAccountIsValidUntil": "Your account will be valid until {date}.", "sendPIN": "Send the PIN below to the bot, then come back here to link your account.", "sendPINDiscord": "Type {command} in {server_channel} on Discord, then send the PIN below.", - "matrixEnterUser": "Enter your User ID, press submit, and a PIN will be sent to you. Enter it here to continue." + "matrixEnterUser": "Enter your User ID, press submit, and a PIN will be sent to you. Enter it here to continue.", + "welcomeUser": "Welcome, {user}" }, "notifications": { "errorUserExists": "User already exists.", @@ -59,4 +60,4 @@ "plural": "Must have at least {n} special characters" } } -} +} \ No newline at end of file diff --git a/lang/form/es-es.json b/lang/form/es-es.json index b446b1d..48c80f9 100644 --- a/lang/form/es-es.json +++ b/lang/form/es-es.json @@ -59,4 +59,4 @@ "plural": "Debe tener al menos {n} caracteres especiales" } } -} +} \ No newline at end of file diff --git a/lang/form/fa-ir.json b/lang/form/fa-ir.json index f3f1f05..e9e35f9 100644 --- a/lang/form/fa-ir.json +++ b/lang/form/fa-ir.json @@ -53,4 +53,4 @@ "plural": "باید حداقل {n} نویسه خاص داشته باشد" } } -} +} \ No newline at end of file diff --git a/lang/form/fr-fr.json b/lang/form/fr-fr.json index 5ad71b3..98e55f8 100644 --- a/lang/form/fr-fr.json +++ b/lang/form/fr-fr.json @@ -61,4 +61,4 @@ "errorNoMatch": "Les mots de passe ne correspondent pas.", "errorAccountLinked": "Compte déjà utilisé." } -} +} \ No newline at end of file diff --git a/lang/form/hu-hu.json b/lang/form/hu-hu.json index 0d88d01..1811732 100644 --- a/lang/form/hu-hu.json +++ b/lang/form/hu-hu.json @@ -59,4 +59,4 @@ "plural": "Legalább {n} speciális karaktert kell tartalmazzon" } } -} +} \ No newline at end of file diff --git a/lang/form/id-id.json b/lang/form/id-id.json index b29fd02..5c30310 100644 --- a/lang/form/id-id.json +++ b/lang/form/id-id.json @@ -57,4 +57,4 @@ "plural": "Harus memiliki setidaknya {n} karakter khusus" } } -} +} \ No newline at end of file diff --git a/lang/form/it-it.json b/lang/form/it-it.json index a3a8b4b..4247b4e 100644 --- a/lang/form/it-it.json +++ b/lang/form/it-it.json @@ -48,4 +48,4 @@ "plural": "Deve avere almeno {n} caratteri speciali" } } -} +} \ No newline at end of file diff --git a/lang/form/nl-nl.json b/lang/form/nl-nl.json index ec14c7c..4441c7c 100644 --- a/lang/form/nl-nl.json +++ b/lang/form/nl-nl.json @@ -58,4 +58,4 @@ "errorNoMatch": "Wachtwoorden komen niet overeen.", "errorCaptcha": "Captcha incorrect." } -} +} \ No newline at end of file diff --git a/lang/form/pl-PL.json b/lang/form/pl-pl.json similarity index 99% rename from lang/form/pl-PL.json rename to lang/form/pl-pl.json index df36a09..abc5d70 100644 --- a/lang/form/pl-PL.json +++ b/lang/form/pl-pl.json @@ -57,4 +57,4 @@ "plural": "Musisz użyć co najmniej {n} znaków specjalnych" } } -} +} \ No newline at end of file diff --git a/lang/form/pt-br.json b/lang/form/pt-br.json index f49fdd9..d767409 100644 --- a/lang/form/pt-br.json +++ b/lang/form/pt-br.json @@ -60,4 +60,4 @@ "plural": "Deve ter pelo menos {n} caracteres especiais" } } -} +} \ No newline at end of file diff --git a/lang/form/ro-RO.json b/lang/form/ro-ro.json similarity index 99% rename from lang/form/ro-RO.json rename to lang/form/ro-ro.json index eb33fde..5e60603 100644 --- a/lang/form/ro-RO.json +++ b/lang/form/ro-ro.json @@ -57,4 +57,4 @@ "plural": "Trebuie să aibă cel puțin {n} caractere speciale" } } -} +} \ No newline at end of file diff --git a/lang/form/sl-si.json b/lang/form/sl-si.json index 401b3a7..86a9484 100644 --- a/lang/form/sl-si.json +++ b/lang/form/sl-si.json @@ -57,4 +57,4 @@ "plural": "Potrebnih je vsaj {n} posebnih znakov" } } -} +} \ No newline at end of file diff --git a/lang/form/sv-se.json b/lang/form/sv-se.json index d65177a..5c8adbd 100644 --- a/lang/form/sv-se.json +++ b/lang/form/sv-se.json @@ -48,4 +48,4 @@ "plural": "Måste ha minst {n} specialtecken" } } -} +} \ No newline at end of file diff --git a/lang/form/vi-VN.json b/lang/form/vi-vn.json similarity index 99% rename from lang/form/vi-VN.json rename to lang/form/vi-vn.json index 5adfa2f..2801c42 100644 --- a/lang/form/vi-VN.json +++ b/lang/form/vi-vn.json @@ -57,4 +57,4 @@ "plural": "" } } -} +} \ No newline at end of file diff --git a/lang/form/zh-hans.json b/lang/form/zh-hans.json index 58cd405..a6568b3 100644 --- a/lang/form/zh-hans.json +++ b/lang/form/zh-hans.json @@ -57,4 +57,4 @@ "plural": "必须至少包含 {n} 个特殊字符" } } -} +} \ No newline at end of file diff --git a/lang/form/zh-Hant.json b/lang/form/zh-hant.json similarity index 99% rename from lang/form/zh-Hant.json rename to lang/form/zh-hant.json index 36decf1..6660474 100644 --- a/lang/form/zh-Hant.json +++ b/lang/form/zh-hant.json @@ -57,4 +57,4 @@ "plural": "必須至少包含 {n} 個特殊字元" } } -} +} \ No newline at end of file diff --git a/lang/pwreset/ar-aa.json b/lang/pwreset/ar-aa.json index 4def373..f2f9614 100644 --- a/lang/pwreset/ar-aa.json +++ b/lang/pwreset/ar-aa.json @@ -13,4 +13,4 @@ "changeYourPassword": "تأكد من تغيير كلمة المرور الخاصة بك بعد تسجيل الدخول.", "enterYourPassword": "أدخل كلمة المرور الجديدة أدناه." } -} +} \ No newline at end of file diff --git a/lang/pwreset/da-dk.json b/lang/pwreset/da-dk.json index f664f3d..28b8f7b 100644 --- a/lang/pwreset/da-dk.json +++ b/lang/pwreset/da-dk.json @@ -13,4 +13,4 @@ "enterYourPassword": "Indtast din nye adgangskode nedenfor.", "youCanLoginPassword": "Du kan nu logge ind med din nye adgangskode. Tryk nedenfor for at fortsætte til Jellyfin." } -} +} \ No newline at end of file diff --git a/lang/pwreset/de-de.json b/lang/pwreset/de-de.json index a5ccf2f..396a5ee 100644 --- a/lang/pwreset/de-de.json +++ b/lang/pwreset/de-de.json @@ -13,4 +13,4 @@ "reset": "Zurücksetzen", "enterYourPassword": "Gib unten dein neues Passwort ein." } -} +} \ No newline at end of file diff --git a/lang/pwreset/en-gb.json b/lang/pwreset/en-gb.json index ea900d9..bcab812 100644 --- a/lang/pwreset/en-gb.json +++ b/lang/pwreset/en-gb.json @@ -13,4 +13,4 @@ "enterYourPassword": "Enter your new password below.", "youCanLoginPassword": "You can now login with your new password. Press below to continue to Jellyfin." } -} +} \ No newline at end of file diff --git a/lang/pwreset/en-us.json b/lang/pwreset/en-us.json index ab5967f..416558b 100644 --- a/lang/pwreset/en-us.json +++ b/lang/pwreset/en-us.json @@ -13,4 +13,4 @@ "changeYourPassword": "Make sure to change your password after you log in.", "enterYourPassword": "Enter your new password below." } -} +} \ No newline at end of file diff --git a/lang/pwreset/es-es.json b/lang/pwreset/es-es.json index fcb4e01..2b82aea 100644 --- a/lang/pwreset/es-es.json +++ b/lang/pwreset/es-es.json @@ -13,4 +13,4 @@ "enterYourPassword": "Ingrese su nueva contraseña abajo.", "youCanLoginPassword": "Ahora puede iniciar sesión con su nueva contraseña. Presione a continuación para continuar con Jellyfin." } -} +} \ No newline at end of file diff --git a/lang/pwreset/fa-ir.json b/lang/pwreset/fa-ir.json index a6a7d5d..71926ae 100644 --- a/lang/pwreset/fa-ir.json +++ b/lang/pwreset/fa-ir.json @@ -12,4 +12,4 @@ "changeYourPassword": "اطمینان حاصل کنید که پس از ورود به سیستم رمز عبور خود را تغییر دهید.", "enterYourPassword": "رمز عبور جدید خود را در زیر وارد کنید." } -} +} \ No newline at end of file diff --git a/lang/pwreset/fr-fr.json b/lang/pwreset/fr-fr.json index d3a2fff..030c787 100644 --- a/lang/pwreset/fr-fr.json +++ b/lang/pwreset/fr-fr.json @@ -13,4 +13,4 @@ "enterYourPassword": "Entrez votre nouveau mot de passe ici.", "youCanLoginPassword": "Vous pouvez maintenant vous connecter avec votre nouveau mot de passe. Appuyez ci-dessous pour continuer vers Jellyfin." } -} +} \ No newline at end of file diff --git a/lang/pwreset/nl-nl.json b/lang/pwreset/nl-nl.json index 93888d3..a003d76 100644 --- a/lang/pwreset/nl-nl.json +++ b/lang/pwreset/nl-nl.json @@ -13,4 +13,4 @@ "enterYourPassword": "Voer hieronder je nieuwe wachtwoord in.", "youCanLoginPassword": "Je kunt nu inloggen met je nieuwe wachtwoord. Druk hieronder om verder te gaan naar Jellyfin." } -} +} \ No newline at end of file diff --git a/lang/pwreset/pl-PL.json b/lang/pwreset/pl-pl.json similarity index 99% rename from lang/pwreset/pl-PL.json rename to lang/pwreset/pl-pl.json index cdd88cc..6c3a8ec 100644 --- a/lang/pwreset/pl-PL.json +++ b/lang/pwreset/pl-pl.json @@ -13,4 +13,4 @@ "changeYourPassword": "Upewnij się, że zmieniłeś swoje hasło po zalogowaniu.", "enterYourPassword": "Podaj swoje hasło poniżej." } -} +} \ No newline at end of file diff --git a/lang/pwreset/pt-br.json b/lang/pwreset/pt-br.json index 632201f..f04b64a 100644 --- a/lang/pwreset/pt-br.json +++ b/lang/pwreset/pt-br.json @@ -13,4 +13,4 @@ "enterYourPassword": "Digite sua nova senha abaixo.", "youCanLoginPassword": "Agora você pode fazer login com sua nova senha. Pressione abaixo para continuar até Jellyfin." } -} +} \ No newline at end of file diff --git a/lang/pwreset/ro-RO.json b/lang/pwreset/ro-ro.json similarity index 99% rename from lang/pwreset/ro-RO.json rename to lang/pwreset/ro-ro.json index e125504..8093f84 100644 --- a/lang/pwreset/ro-RO.json +++ b/lang/pwreset/ro-ro.json @@ -13,4 +13,4 @@ "changeYourPassword": "Asigurați-vă că vă schimbați parola după ce vă conectați.", "enterYourPassword": "Introduceți noua parolă mai jos." } -} +} \ No newline at end of file diff --git a/lang/pwreset/sl-si.json b/lang/pwreset/sl-si.json index 0a73467..7174947 100644 --- a/lang/pwreset/sl-si.json +++ b/lang/pwreset/sl-si.json @@ -13,4 +13,4 @@ "changeYourPassword": "Spremenite svoje geslo po prijavi.", "enterYourPassword": "Vnesite svoje novo geslo spodaj." } -} +} \ No newline at end of file diff --git a/lang/pwreset/zh-hans.json b/lang/pwreset/zh-hans.json index 338a4e2..247b915 100644 --- a/lang/pwreset/zh-hans.json +++ b/lang/pwreset/zh-hans.json @@ -13,4 +13,4 @@ "enterYourPassword": "在下面输入您的新密码。", "youCanLoginPassword": "您现在可以使用新密码登录。请按下面按钮跳转到Jellyfin。" } -} +} \ No newline at end of file diff --git a/lang/pwreset/zh-Hant.json b/lang/pwreset/zh-hant.json similarity index 99% rename from lang/pwreset/zh-Hant.json rename to lang/pwreset/zh-hant.json index 0ded114..f27da59 100644 --- a/lang/pwreset/zh-Hant.json +++ b/lang/pwreset/zh-hant.json @@ -13,4 +13,4 @@ "changeYourPassword": "請務必在登錄后更改密碼。", "enterYourPassword": "在下方輸入您的新密碼。" } -} +} \ No newline at end of file diff --git a/lang/setup/da-dk.json b/lang/setup/da-dk.json index f640e70..7610825 100644 --- a/lang/setup/da-dk.json +++ b/lang/setup/da-dk.json @@ -147,4 +147,4 @@ "title": "Beskeder", "description": "jfa-go kan sende nulstilling af adgangskoder og forskellige meddelelser via E-mail, Discord, Telegram og/eller Matrix. Du kan konfigurere E-mail herunder, og de andre kan konfigureres i Indstillinger senere. Instruktioner kan findes på {n}. Hvis du ikke har brug for dette, kan du deaktivere disse funktioner her." } -} +} \ No newline at end of file diff --git a/lang/setup/de-de.json b/lang/setup/de-de.json index 93bbc94..10cebb9 100644 --- a/lang/setup/de-de.json +++ b/lang/setup/de-de.json @@ -147,4 +147,4 @@ "title": "Mitteilungen", "description": "jfa-go kann Passwortrücksetzungen und verschiedene Benachrichtigungen per E-Mail, Discord, Telegram und/oder Matrix verschicken. E-Mail kannst du unten einrichten, die Anderen später in den Einstellungen. Anweisungen findest du im {n}. Falls nicht benötigt, kannst du diese Funktionen hier deaktivieren." } -} +} \ No newline at end of file diff --git a/lang/setup/el-gr.json b/lang/setup/el-gr.json index a144361..5c2e5f8 100644 --- a/lang/setup/el-gr.json +++ b/lang/setup/el-gr.json @@ -131,4 +131,4 @@ "stable": "Σταθερό", "unstable": "Ασταθές" } -} +} \ No newline at end of file diff --git a/lang/setup/en-gb.json b/lang/setup/en-gb.json index 5675a16..9a16375 100644 --- a/lang/setup/en-gb.json +++ b/lang/setup/en-gb.json @@ -147,4 +147,4 @@ "title": "Invite Messages", "description": "If enabled, you can send invites directly to a user's email address, Discord or Matrix user. Because you might be using a reverse proxy, you need to provide the URL invites are accessed from. Write your URL Base, and append '/invite'." } -} +} \ No newline at end of file diff --git a/lang/setup/en-us.json b/lang/setup/en-us.json index 79780c0..75ec956 100644 --- a/lang/setup/en-us.json +++ b/lang/setup/en-us.json @@ -149,4 +149,4 @@ "emailMessage": "Email Message", "emailMessageNotice": "Displays at the bottom of emails." } -} +} \ No newline at end of file diff --git a/lang/setup/es-es.json b/lang/setup/es-es.json index f4e1b63..7ff7964 100644 --- a/lang/setup/es-es.json +++ b/lang/setup/es-es.json @@ -147,4 +147,4 @@ "description": "jfa-go puede enviar restablecimientos de contraseña y varios mensajes a través de correo electrónico, Discord, Telegram y/o Matrix. Puede configurar el correo electrónico a continuación y los demás se pueden configurar en Configuración más adelante. Las instrucciones se pueden encontrar en el {n}. Si no lo necesita, puede desactivar estas funciones aquí.", "title": "Mensajes" } -} +} \ No newline at end of file diff --git a/lang/setup/fr-fr.json b/lang/setup/fr-fr.json index 057a48d..2ec2ccf 100644 --- a/lang/setup/fr-fr.json +++ b/lang/setup/fr-fr.json @@ -147,4 +147,4 @@ "title": "Messages", "description": "jfa-go peut envoyer des réinitialisations de mot de passe et divers messages par e-mail, Discord, Telegram et/ou Matrix. Vous pouvez configurer l'e-mail ci-dessous, et les autres peuvent être configurés dans les paramètres plus tard. Les instructions se trouvent sur le {n}. Si vous n'en avez pas besoin, vous pouvez désactiver ces fonctionnalités ici." } -} +} \ No newline at end of file diff --git a/lang/setup/hu-HU.json b/lang/setup/hu-hu.json similarity index 99% rename from lang/setup/hu-HU.json rename to lang/setup/hu-hu.json index 404dd83..fd0ba3b 100644 --- a/lang/setup/hu-HU.json +++ b/lang/setup/hu-hu.json @@ -147,4 +147,4 @@ "emailMessage": "", "emailMessageNotice": "" } -} +} \ No newline at end of file diff --git a/lang/setup/id-id.json b/lang/setup/id-id.json index 5190924..3b9b0ce 100644 --- a/lang/setup/id-id.json +++ b/lang/setup/id-id.json @@ -124,4 +124,4 @@ "emailMessage": "Pesan Email", "emailMessageNotice": "Ditampilkan di bagian bawah email." } -} +} \ No newline at end of file diff --git a/lang/setup/nl-nl.json b/lang/setup/nl-nl.json index 6bcc028..b581199 100644 --- a/lang/setup/nl-nl.json +++ b/lang/setup/nl-nl.json @@ -147,4 +147,4 @@ "title": "Berichten", "description": "jfa-go kan wachtwoordresets en verschillende berichten sturen via E-mail, Discord, Telegram, en/of Matrix. Je kunt e-mail hieronder instellen, en de rest kan later bij Instellingen aangepast worden. Instructies staan op de {n}. Als je dit niet nodig hebt, kun je deze onderdelen hier uitschakelen." } -} +} \ No newline at end of file diff --git a/lang/setup/pl-PL.json b/lang/setup/pl-pl.json similarity index 99% rename from lang/setup/pl-PL.json rename to lang/setup/pl-pl.json index 455a423..232007d 100644 --- a/lang/setup/pl-PL.json +++ b/lang/setup/pl-pl.json @@ -147,4 +147,4 @@ "emailMessage": "", "emailMessageNotice": "" } -} +} \ No newline at end of file diff --git a/lang/setup/pt-br.json b/lang/setup/pt-br.json index 860579c..61bb920 100644 --- a/lang/setup/pt-br.json +++ b/lang/setup/pt-br.json @@ -147,4 +147,4 @@ "title": "Mensagens", "description": "jfa-go pode enviar redefinições de senha e várias mensagens por e-mail, Discord, Telegram e/ou Matrix. Você pode configurar o e-mail abaixo e os outros podem ser configurados em Configurações posteriormente. As instruções podem ser encontradas em {n}. Se você não precisar, pode desativar esses recursos aqui." } -} +} \ No newline at end of file diff --git a/lang/setup/sl-si.json b/lang/setup/sl-si.json index ae7fe12..2128c0e 100644 --- a/lang/setup/sl-si.json +++ b/lang/setup/sl-si.json @@ -146,4 +146,4 @@ "emailMessage": "", "emailMessageNotice": "" } -} +} \ No newline at end of file diff --git a/lang/setup/sv-se.json b/lang/setup/sv-se.json index 9b409c1..1f76cf8 100644 --- a/lang/setup/sv-se.json +++ b/lang/setup/sv-se.json @@ -134,4 +134,4 @@ "stable": "Stabil", "unstable": "Ostabil" } -} +} \ No newline at end of file diff --git a/lang/setup/zh-hans.json b/lang/setup/zh-hans.json index 67165b1..872bb33 100644 --- a/lang/setup/zh-hans.json +++ b/lang/setup/zh-hans.json @@ -147,4 +147,4 @@ "emailMessage": "电子邮件", "emailMessageNotice": "显示在电子邮件的底部。" } -} +} \ No newline at end of file diff --git a/lang/setup/zh-Hant.json b/lang/setup/zh-hant.json similarity index 99% rename from lang/setup/zh-Hant.json rename to lang/setup/zh-hant.json index 6ee006f..fc0f0c7 100644 --- a/lang/setup/zh-Hant.json +++ b/lang/setup/zh-hant.json @@ -147,4 +147,4 @@ "emailMessage": "電子郵件訊息", "emailMessageNotice": "顯示在電子郵件的底部。" } -} +} \ No newline at end of file diff --git a/lang/telegram/ar-AA.json b/lang/telegram/ar-aa.json similarity index 99% rename from lang/telegram/ar-AA.json rename to lang/telegram/ar-aa.json index f34a35c..bed9e51 100644 --- a/lang/telegram/ar-AA.json +++ b/lang/telegram/ar-aa.json @@ -13,4 +13,4 @@ "languageSet": "تم تعيين اللغة على {language}.", "discordDMs": "يرجى التحقق من الرسائل المباشرة الخاصة بك للحصول على رد." } -} +} \ No newline at end of file diff --git a/lang/telegram/da-dk.json b/lang/telegram/da-dk.json index 5cefaeb..5dad6c9 100644 --- a/lang/telegram/da-dk.json +++ b/lang/telegram/da-dk.json @@ -13,4 +13,4 @@ "languageSet": "Sprog indstillet til {language}.", "discordDMs": "Tjek venligst dine DM's for et svar." } -} +} \ No newline at end of file diff --git a/lang/telegram/de-de.json b/lang/telegram/de-de.json index fa3acbb..d1793ae 100644 --- a/lang/telegram/de-de.json +++ b/lang/telegram/de-de.json @@ -13,4 +13,4 @@ "languageSet": "Sprache auf {language} geändert.", "discordDMs": "Schaue in deinen DMs nach einer Antwort." } -} +} \ No newline at end of file diff --git a/lang/telegram/en-gb.json b/lang/telegram/en-gb.json index 14e1add..8d7075b 100644 --- a/lang/telegram/en-gb.json +++ b/lang/telegram/en-gb.json @@ -13,4 +13,4 @@ "languageMessageDiscord": "Note: set your language with /lang .", "languageSet": "Language set to {language}." } -} +} \ No newline at end of file diff --git a/lang/telegram/en-us.json b/lang/telegram/en-us.json index fd35ae3..c5144e3 100644 --- a/lang/telegram/en-us.json +++ b/lang/telegram/en-us.json @@ -13,4 +13,4 @@ "languageSet": "Language set to {language}.", "discordDMs": "Please check your DMs for a response." } -} +} \ No newline at end of file diff --git a/lang/telegram/es-es.json b/lang/telegram/es-es.json index 6c28303..b1e2ae3 100644 --- a/lang/telegram/es-es.json +++ b/lang/telegram/es-es.json @@ -13,4 +13,4 @@ "languageSet": "El idioma esta configurado como {language}.", "discordDMs": "Por favor, compruebe sus DMs para una respuesta." } -} +} \ No newline at end of file diff --git a/lang/telegram/fa-ir.json b/lang/telegram/fa-ir.json index d3cce35..654c6a9 100644 --- a/lang/telegram/fa-ir.json +++ b/lang/telegram/fa-ir.json @@ -9,4 +9,4 @@ "pinSuccess": "موفقیت! اکنون می توانید به صفحه ثبت نام بازگردید.", "languageMessage": "توجه: زبانهای موجود با {command} را مشاهده کرده و زبان را با {command} تنظیم کنید." } -} +} \ No newline at end of file diff --git a/lang/telegram/fr-fr.json b/lang/telegram/fr-fr.json index b1a9e3f..648e3bb 100644 --- a/lang/telegram/fr-fr.json +++ b/lang/telegram/fr-fr.json @@ -13,4 +13,4 @@ "languageSet": "Langue définie sur {language}.", "languageMessageDiscord": "Note : définissez votre langue avec /lang ." } -} +} \ No newline at end of file diff --git a/lang/telegram/it-IT.json b/lang/telegram/it-it.json similarity index 99% rename from lang/telegram/it-IT.json rename to lang/telegram/it-it.json index f26fe4e..cbd945b 100644 --- a/lang/telegram/it-IT.json +++ b/lang/telegram/it-it.json @@ -13,4 +13,4 @@ "languageSet": "", "discordDMs": "" } -} +} \ No newline at end of file diff --git a/lang/telegram/nl-nl.json b/lang/telegram/nl-nl.json index ef7fb21..a94316f 100644 --- a/lang/telegram/nl-nl.json +++ b/lang/telegram/nl-nl.json @@ -13,4 +13,4 @@ "languageSet": "Taal ingesteld als {language}.", "discordDMs": "Bekijk alsjeblieft je DMs voor een antwoord." } -} +} \ No newline at end of file diff --git a/lang/telegram/pl-PL.json b/lang/telegram/pl-pl.json similarity index 99% rename from lang/telegram/pl-PL.json rename to lang/telegram/pl-pl.json index b18b204..2e1a212 100644 --- a/lang/telegram/pl-PL.json +++ b/lang/telegram/pl-pl.json @@ -13,4 +13,4 @@ "languageSet": "Język ustawiony jako {language}.", "discordDMs": "Sprawdź swoje wiadomości, aby uzyskać odpowiedź." } -} +} \ No newline at end of file diff --git a/lang/telegram/pt-br.json b/lang/telegram/pt-br.json index 900d8d2..763234f 100644 --- a/lang/telegram/pt-br.json +++ b/lang/telegram/pt-br.json @@ -13,4 +13,4 @@ "discordDMs": "Por favor, verifique seus DMs para uma resposta.", "discordStartMessage": "Oi!\n Digite seu PIN com `/pin ` para verificar sua conta." } -} +} \ No newline at end of file diff --git a/lang/telegram/ro-RO.json b/lang/telegram/ro-ro.json similarity index 99% rename from lang/telegram/ro-RO.json rename to lang/telegram/ro-ro.json index 5825ba5..3ab408e 100644 --- a/lang/telegram/ro-RO.json +++ b/lang/telegram/ro-ro.json @@ -13,4 +13,4 @@ "languageSet": "Limba setată la {language}.", "discordDMs": "Vă rugăm să verificați DM-urile pentru un răspuns." } -} +} \ No newline at end of file diff --git a/lang/telegram/sl-si.json b/lang/telegram/sl-si.json index 2291294..09ec047 100644 --- a/lang/telegram/sl-si.json +++ b/lang/telegram/sl-si.json @@ -13,4 +13,4 @@ "languageSet": "Jezik nastavljen na {language}.", "discordDMs": "Prosimo preverite svoja zasebna sporočila za odziv." } -} +} \ No newline at end of file diff --git a/lang/telegram/zh-hans.json b/lang/telegram/zh-hans.json index c7159b1..84f3ab8 100644 --- a/lang/telegram/zh-hans.json +++ b/lang/telegram/zh-hans.json @@ -13,4 +13,4 @@ "languageSet": "语言改成 {language}。", "discordDMs": "请检查您的DM找回答。" } -} +} \ No newline at end of file diff --git a/lang/telegram/zh-Hant.json b/lang/telegram/zh-hant.json similarity index 99% rename from lang/telegram/zh-Hant.json rename to lang/telegram/zh-hant.json index 5b730f2..7cc97f2 100644 --- a/lang/telegram/zh-Hant.json +++ b/lang/telegram/zh-hant.json @@ -13,4 +13,4 @@ "languageSet": "語言設置為｛Language｝。", "discordDMs": "請檢查您的私人通信以獲取回復。" } -} +} \ No newline at end of file diff --git a/main.go b/main.go index 777078c..40ce405 100644 --- a/main.go +++ b/main.go @@ -651,6 +651,9 @@ func flagPassed(name string) (found bool) { // @tag.name Auth // @tag.description -Get a token here if running swagger UI locally.- +// @tag.name User Page +// @tag.description User-page related routes. + // @tag.name Users // @tag.description Jellyfin user related operations. diff --git a/models.go b/models.go index d553268..6ce0e84 100644 --- a/models.go +++ b/models.go @@ -373,3 +373,9 @@ type ReCaptchaResponseDTO struct { Hostname string `json:"hostname"` ErrorCodes []string `json:"error-codes"` } + +// MyDetailsDTO is sent to the user page to personalize it for the user. +type MyDetailsDTO struct { + Id string `json:"id"` + Username string `json:"username"` +} diff --git a/package-lock.json b/package-lock.json index 173cc4f..d53ad2c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,7 @@ "any-date-parser": "^1.5.4", "browserslist": "^4.21.7", "cheerio": "^1.0.0-rc.12", - "esbuild": "^0.18.3", + "esbuild": "^0.18.4", "fs-cheerio": "^3.0.0", "inline-source": "^8.0.2", "jsdom": "^22.1.0", @@ -57,9 +57,9 @@ } }, "node_modules/@esbuild/android-arm": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.3.tgz", - "integrity": "sha512-QOn3VIlL6Qv1eHBpQB/s7simaZgGss2ASyxDOwYSLmc6vD0uuizZkuYawHmuLjWEm5wPwp0JQWhbpaYwwGevYw==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.4.tgz", + "integrity": "sha512-yKmQC9IiuvHdsNEbPHSprnMHg6OhL1cSeQZLzPpgzJBJ9ppEg9GAZN8MKj1TcmB4tZZUrq5xjK7KCmhwZP8iDA==", "cpu": [ "arm" ], @@ -72,9 +72,9 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.3.tgz", - "integrity": "sha512-PgabCsoaEEnnOiF6rUhOBXgYoLFIrHWP6mfLOzuQ1oZ1lwBdTL0hp5ivC4K3Kvz3BD8EipjeQo6l0aty3nr4qQ==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.4.tgz", + "integrity": "sha512-yQVgO+V307hA2XhzELQ6F91CBGX7gSnlVGAj5YIqjQOxThDpM7fOcHT2YLJbE6gNdPtgRSafQrsK8rJ9xHCaZg==", "cpu": [ "arm64" ], @@ -87,9 +87,9 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.3.tgz", - "integrity": "sha512-1OkJf8wNX1W5ucbp5HrK+z42b9DINb4ix59oJH/PIsh9cyFMqjgRKtCBXg0zEWhkmP1k3egdfrnS7cDTpLH43g==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.4.tgz", + "integrity": "sha512-yLKXMxQg6sk1ntftxQ5uwyVgG4/S2E7UoOCc5N4YZW7fdkfRiYEXqm7CMuIfY2Vs3FTrNyKmSfNevIuIvJnMww==", "cpu": [ "x64" ], @@ -102,9 +102,9 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.3.tgz", - "integrity": "sha512-57aofORpY7wDAuMs6DeqpmgSnVfZ63RgGbR/BHdOSTqJgYvHDCMY7/o1myFntl3k0YxtLE3WAm56nMf4qy3UDw==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.4.tgz", + "integrity": "sha512-MVPEoZjZpk2xQ1zckZrb8eQuQib+QCzdmMs3YZAYEQPg+Rztk5pUxGyk8htZOC8Z38NMM29W+MqY9Sqo/sDGKw==", "cpu": [ "arm64" ], @@ -117,9 +117,9 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.3.tgz", - "integrity": "sha512-NVBqMnxT9qvgu7Z322LUDlwjh4GDk6wEePyAQnHF9noxik/WvLFmr5v3Vgz5LSvqFducLCxsdmLztKhdpFW0Gg==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.4.tgz", + "integrity": "sha512-uEsRtYRUDsz7i2tXg/t/SyF+5gU1cvi9B6B8i5ebJgtUUHJYWyIPIesmIOL4/+bywjxsDMA/XrNFMgMffLnh5A==", "cpu": [ "x64" ], @@ -132,9 +132,9 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.3.tgz", - "integrity": "sha512-XiLK1AsCk2wKxN7j8h9GXXCs8FPZhp07U0rnpwRkAVSVGgLaIWYSqpTRzKjAfqJiZlp+XKo1HwsmDdICEKB3Dg==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.4.tgz", + "integrity": "sha512-I8EOigqWnOHRin6Zp5Y1cfH3oT54bd7Sdz/VnpUNksbOtfp8IWRTH4pgkgO5jWaRQPjCpJcOpdRjYAMjPt8wXg==", "cpu": [ "arm64" ], @@ -147,9 +147,9 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.3.tgz", - "integrity": "sha512-xyITfrF0G3l1gwR79hvNCCWKQ/16uK14xNNPFgzjbIqF4EpBvhO6l3jrWxXFUW51z6dVIl2Szh3x3uIbBWzH1Q==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.4.tgz", + "integrity": "sha512-1bHfgMz/cNMjbpsYxjVgMJ1iwKq+NdDPlACBrWULD7ZdFmBQrhMicMaKb5CdmdVyvIwXmasOuF4r6Iq574kUTA==", "cpu": [ "x64" ], @@ -162,9 +162,9 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.3.tgz", - "integrity": "sha512-fc/T0QHMzvmnlF+kfD6bHLB8u+17gg13260p/E86yYjVoKNFjonL/+Y0GGQjMbFUas9QijqOa7pcR00a9RNkwg==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.4.tgz", + "integrity": "sha512-4XCGqM/Ay1LCXUBH59bL4JbSbbTK1K22dWHymWMGaEh2sQCDOUw+OQxozYV/YdBb91leK2NbuSrE2BRamwgaYw==", "cpu": [ "arm" ], @@ -177,9 +177,9 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.3.tgz", - "integrity": "sha512-lsKUYVd8L/j2uNs8dhMjMsKC5MHYh77gR9EThu7YCeeFz1XpIkx1I4a7mhoVfPS2VPVD1pMCh+PgxuAHUcEmXw==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.4.tgz", + "integrity": "sha512-J42vLHaYREyiBwH0eQE4/7H1DTfZx8FuxyWSictx4d7ezzuKE3XOkIvOg+SQzRz7T9HLVKzq2tvbAov4UfufBw==", "cpu": [ "arm64" ], @@ -192,9 +192,9 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.3.tgz", - "integrity": "sha512-EyfGWeOwRqK5Xj18vok0qv8IFBZ1/+hKV+cqD44oVhGsxHo9TmPtoSiDrWn8Sa2swq/VuO5Aiog6YPDj81oIkA==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.4.tgz", + "integrity": "sha512-4ksIqFwhq7OExty7Sl1n0vqQSCqTG4sU6i99G2yuMr28CEOUZ/60N+IO9hwI8sIxBqmKmDgncE1n5CMu/3m0IA==", "cpu": [ "ia32" ], @@ -207,9 +207,9 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.3.tgz", - "integrity": "sha512-PwXkcl3t0kSeYH5RuJIeh/fHOzKZd+ZdifAWzpVO+9TLWArutTFBJvOSkTZ3CcqQqNrTj1Qyo6nqE8MQj/a7cQ==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.4.tgz", + "integrity": "sha512-bsWtoVHkGQgAsFXioDueXRiUIfSGrVkJjBBz4gcBJxXcD461cWFQFyu8Fxdj9TP+zEeqJ8C/O4LFFMBNi6Fscw==", "cpu": [ "loong64" ], @@ -222,9 +222,9 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.3.tgz", - "integrity": "sha512-CRVkkSXf5GQcq7Am2a2tdIn85oqi/bkjuPvhNqcdeTgI0xgNbqLnEPRy2AEGkRuaJWB5uCX1IC4sqnY8ET14Yg==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.4.tgz", + "integrity": "sha512-LRD9Fu8wJQgIOOV1o3nRyzrheFYjxA0C1IVWZ93eNRRWBKgarYFejd5WBtrp43cE4y4D4t3qWWyklm73Mrsd/g==", "cpu": [ "mips64el" ], @@ -237,9 +237,9 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.3.tgz", - "integrity": "sha512-t7zK1Cheh0xvzfZbimztiE0wGnpV+YRsBg3tefcEBN3O4GzgLu6fFpA5HxEyVm3hHZW1jAC4OhoGEp7C5Ii6Eg==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.4.tgz", + "integrity": "sha512-jtQgoZjM92gauVRxNaaG/TpL3Pr4WcL3Pwqi9QgdrBGrEXzB+twohQiWNSTycs6lUygakos4mm2h0B9/SHveng==", "cpu": [ "ppc64" ], @@ -252,9 +252,9 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.3.tgz", - "integrity": "sha512-fUZPtyCYih6y4lDYdSM4Yoax4nS7aH0/XixJStys+9tfp5cAlIAZhEVKOOdeGXmQn0IEyiUtlIsPnfObbeDQfQ==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.4.tgz", + "integrity": "sha512-7WaU/kRZG0VCV09Xdlkg6LNAsfU9SAxo6XEdaZ8ffO4lh+DZoAhGTx7+vTMOXKxa+r2w1LYDGxfJa2rcgagMRA==", "cpu": [ "riscv64" ], @@ -267,9 +267,9 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.3.tgz", - "integrity": "sha512-oIcK2LqHWqfMERqjvaKJ3QJmycHn723HsXIv5gH4iGfmePfSj+gi0ZQv2h4bHUg2bs2gJtV0DlIjGhEuvdgxLw==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.4.tgz", + "integrity": "sha512-D19ed0xreKQvC5t+ArE2njSnm18WPpE+1fhwaiJHf+Xwqsq+/SUaV8Mx0M27nszdU+Atq1HahrgCOZCNNEASUg==", "cpu": [ "s390x" ], @@ -282,9 +282,9 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.3.tgz", - "integrity": "sha512-RW9lpfZ6XZ6f5to2DJPvt0f/4RXEW229Xf++quVoW+YbnPrcapIJChtD/AmZ8cK3hglO/hXxJjs21pV0/l7L5w==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.4.tgz", + "integrity": "sha512-Rx3AY1sxyiO/gvCGP00nL69L60dfmWyjKWY06ugpB8Ydpdsfi3BHW58HWC24K3CAjAPSwxcajozC2PzA9JBS1g==", "cpu": [ "x64" ], @@ -297,9 +297,9 @@ } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.3.tgz", - "integrity": "sha512-piZ2oBoaq58pKZvhgdV6PemlL30Uhd9GmmOkIGZYgChwNcyVSSl6iMEJxMzU7x44Lk9q+hJ6a343M/iVEMEvxA==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.4.tgz", + "integrity": "sha512-AaShPmN9c6w1mKRpliKFlaWcSkpBT4KOlk93UfFgeI3F3cbjzdDKGsbKnOZozmYbE1izZKLmNJiW0sFM+A5JPA==", "cpu": [ "x64" ], @@ -312,9 +312,9 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.3.tgz", - "integrity": "sha512-vaMfouYTz/4tKdQsXDccqhV6wgPEr+hfuxdNU5Pl/vQxYTsqcXv5DYEa5Z1RAxCoua5aEB+Uj5V7VT/bM92wxw==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.4.tgz", + "integrity": "sha512-tRGvGwou3BrvHVvF8HxTqEiC5VtPzySudS9fh2jBIKpLX7HCW8jIkW+LunkFDNwhslx4xMAgh0jAHsx/iCymaQ==", "cpu": [ "x64" ], @@ -327,9 +327,9 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.3.tgz", - "integrity": "sha512-Fa3rNQQ9q1qwy9u2cdDvuGKy3jmPnPPMDdyy/qbn5d395Pb9hjLYiPzX9BozXMPJDlCNofSY7jN3miM9gyAdHA==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.4.tgz", + "integrity": "sha512-acORFDI95GKhmAnlH8EarBeuqoy/j3yxIU+FDB91H3+ZON+8HhTadtT450YkaMzX6lEWbhi+mjVUCj00M5yyOQ==", "cpu": [ "x64" ], @@ -342,9 +342,9 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.3.tgz", - "integrity": "sha512-LPJC8ub+9uzyC6ygVmp00dAqet1q1DsZ/OldGIIBt+y+Ctd1OfnKNlzQgXK8nxwY1G8fAhklFSeSRRgAUJnR0w==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.4.tgz", + "integrity": "sha512-1NxP+iOk8KSvS1L9SSxEvBAJk39U0GiGZkiiJGbuDF9G4fG7DSDw6XLxZMecAgmvQrwwx7yVKdNN3GgNh0UfKg==", "cpu": [ "arm64" ], @@ -357,9 +357,9 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.3.tgz", - "integrity": "sha512-WtUyRspyxZR6NTc2HG4xd9Wvz8lP4C6OUY1gAqisrf151HvXIxsK0mfAacFJNS7EN2wvPTgjP+SM8vgBOx5+zA==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.4.tgz", + "integrity": "sha512-OKr8jze93vbgqZ/r23woWciTixUwLa976C9W7yNBujtnVHyvsL/ocYG61tsktUfJOpyIz5TsohkBZ6Lo2+PCcQ==", "cpu": [ "ia32" ], @@ -372,9 +372,9 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.3.tgz", - "integrity": "sha512-Z8qCK4BkBm40j5KUM4NrkxYQS0R12cBO1NBVtI4vws6uwh1n/VaNu31Hm+n2cJUWdFbfH57PBghkhm9yLgmPfw==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.4.tgz", + "integrity": "sha512-qJr3wVvcLjPFcV4AMDS3iquhBfTef2zo/jlm8RMxmiRp3Vy2HY8WMxrykJlcbCnqLXZPA0YZxZGND6eug85ogg==", "cpu": [ "x64" ], @@ -1647,9 +1647,9 @@ } }, "node_modules/esbuild": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.3.tgz", - "integrity": "sha512-eadWJC4CRpj93+miO5ZBlvCv+m2x6pzyNBznTvUeLFObMmxs1IMd8cCf6qiDVEZuDL6W8W7u+ZNW3GKEfOdDsA==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.4.tgz", + "integrity": "sha512-9rxWV/Cb2DMUXfe9aUsYtqg0KTlw146ElFH22kYeK9KVV1qT082X4lpmiKsa12ePiCcIcB686TQJxaGAa9TFvA==", "hasInstallScript": true, "bin": { "esbuild": "bin/esbuild" @@ -1658,28 +1658,28 @@ "node": ">=12" }, "optionalDependencies": { - "@esbuild/android-arm": "0.18.3", - "@esbuild/android-arm64": "0.18.3", - "@esbuild/android-x64": "0.18.3", - "@esbuild/darwin-arm64": "0.18.3", - "@esbuild/darwin-x64": "0.18.3", - "@esbuild/freebsd-arm64": "0.18.3", - "@esbuild/freebsd-x64": "0.18.3", - "@esbuild/linux-arm": "0.18.3", - "@esbuild/linux-arm64": "0.18.3", - "@esbuild/linux-ia32": "0.18.3", - "@esbuild/linux-loong64": "0.18.3", - "@esbuild/linux-mips64el": "0.18.3", - "@esbuild/linux-ppc64": "0.18.3", - "@esbuild/linux-riscv64": "0.18.3", - "@esbuild/linux-s390x": "0.18.3", - "@esbuild/linux-x64": "0.18.3", - "@esbuild/netbsd-x64": "0.18.3", - "@esbuild/openbsd-x64": "0.18.3", - "@esbuild/sunos-x64": "0.18.3", - "@esbuild/win32-arm64": "0.18.3", - "@esbuild/win32-ia32": "0.18.3", - "@esbuild/win32-x64": "0.18.3" + "@esbuild/android-arm": "0.18.4", + "@esbuild/android-arm64": "0.18.4", + "@esbuild/android-x64": "0.18.4", + "@esbuild/darwin-arm64": "0.18.4", + "@esbuild/darwin-x64": "0.18.4", + "@esbuild/freebsd-arm64": "0.18.4", + "@esbuild/freebsd-x64": "0.18.4", + "@esbuild/linux-arm": "0.18.4", + "@esbuild/linux-arm64": "0.18.4", + "@esbuild/linux-ia32": "0.18.4", + "@esbuild/linux-loong64": "0.18.4", + "@esbuild/linux-mips64el": "0.18.4", + "@esbuild/linux-ppc64": "0.18.4", + "@esbuild/linux-riscv64": "0.18.4", + "@esbuild/linux-s390x": "0.18.4", + "@esbuild/linux-x64": "0.18.4", + "@esbuild/netbsd-x64": "0.18.4", + "@esbuild/openbsd-x64": "0.18.4", + "@esbuild/sunos-x64": "0.18.4", + "@esbuild/win32-arm64": "0.18.4", + "@esbuild/win32-ia32": "0.18.4", + "@esbuild/win32-x64": "0.18.4" } }, "node_modules/escalade": { @@ -6797,135 +6797,135 @@ } }, "@esbuild/android-arm": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.3.tgz", - "integrity": "sha512-QOn3VIlL6Qv1eHBpQB/s7simaZgGss2ASyxDOwYSLmc6vD0uuizZkuYawHmuLjWEm5wPwp0JQWhbpaYwwGevYw==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.4.tgz", + "integrity": "sha512-yKmQC9IiuvHdsNEbPHSprnMHg6OhL1cSeQZLzPpgzJBJ9ppEg9GAZN8MKj1TcmB4tZZUrq5xjK7KCmhwZP8iDA==", "optional": true }, "@esbuild/android-arm64": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.3.tgz", - "integrity": "sha512-PgabCsoaEEnnOiF6rUhOBXgYoLFIrHWP6mfLOzuQ1oZ1lwBdTL0hp5ivC4K3Kvz3BD8EipjeQo6l0aty3nr4qQ==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.4.tgz", + "integrity": "sha512-yQVgO+V307hA2XhzELQ6F91CBGX7gSnlVGAj5YIqjQOxThDpM7fOcHT2YLJbE6gNdPtgRSafQrsK8rJ9xHCaZg==", "optional": true }, "@esbuild/android-x64": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.3.tgz", - "integrity": "sha512-1OkJf8wNX1W5ucbp5HrK+z42b9DINb4ix59oJH/PIsh9cyFMqjgRKtCBXg0zEWhkmP1k3egdfrnS7cDTpLH43g==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.4.tgz", + "integrity": "sha512-yLKXMxQg6sk1ntftxQ5uwyVgG4/S2E7UoOCc5N4YZW7fdkfRiYEXqm7CMuIfY2Vs3FTrNyKmSfNevIuIvJnMww==", "optional": true }, "@esbuild/darwin-arm64": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.3.tgz", - "integrity": "sha512-57aofORpY7wDAuMs6DeqpmgSnVfZ63RgGbR/BHdOSTqJgYvHDCMY7/o1myFntl3k0YxtLE3WAm56nMf4qy3UDw==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.4.tgz", + "integrity": "sha512-MVPEoZjZpk2xQ1zckZrb8eQuQib+QCzdmMs3YZAYEQPg+Rztk5pUxGyk8htZOC8Z38NMM29W+MqY9Sqo/sDGKw==", "optional": true }, "@esbuild/darwin-x64": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.3.tgz", - "integrity": "sha512-NVBqMnxT9qvgu7Z322LUDlwjh4GDk6wEePyAQnHF9noxik/WvLFmr5v3Vgz5LSvqFducLCxsdmLztKhdpFW0Gg==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.4.tgz", + "integrity": "sha512-uEsRtYRUDsz7i2tXg/t/SyF+5gU1cvi9B6B8i5ebJgtUUHJYWyIPIesmIOL4/+bywjxsDMA/XrNFMgMffLnh5A==", "optional": true }, "@esbuild/freebsd-arm64": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.3.tgz", - "integrity": "sha512-XiLK1AsCk2wKxN7j8h9GXXCs8FPZhp07U0rnpwRkAVSVGgLaIWYSqpTRzKjAfqJiZlp+XKo1HwsmDdICEKB3Dg==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.4.tgz", + "integrity": "sha512-I8EOigqWnOHRin6Zp5Y1cfH3oT54bd7Sdz/VnpUNksbOtfp8IWRTH4pgkgO5jWaRQPjCpJcOpdRjYAMjPt8wXg==", "optional": true }, "@esbuild/freebsd-x64": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.3.tgz", - "integrity": "sha512-xyITfrF0G3l1gwR79hvNCCWKQ/16uK14xNNPFgzjbIqF4EpBvhO6l3jrWxXFUW51z6dVIl2Szh3x3uIbBWzH1Q==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.4.tgz", + "integrity": "sha512-1bHfgMz/cNMjbpsYxjVgMJ1iwKq+NdDPlACBrWULD7ZdFmBQrhMicMaKb5CdmdVyvIwXmasOuF4r6Iq574kUTA==", "optional": true }, "@esbuild/linux-arm": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.3.tgz", - "integrity": "sha512-fc/T0QHMzvmnlF+kfD6bHLB8u+17gg13260p/E86yYjVoKNFjonL/+Y0GGQjMbFUas9QijqOa7pcR00a9RNkwg==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.4.tgz", + "integrity": "sha512-4XCGqM/Ay1LCXUBH59bL4JbSbbTK1K22dWHymWMGaEh2sQCDOUw+OQxozYV/YdBb91leK2NbuSrE2BRamwgaYw==", "optional": true }, "@esbuild/linux-arm64": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.3.tgz", - "integrity": "sha512-lsKUYVd8L/j2uNs8dhMjMsKC5MHYh77gR9EThu7YCeeFz1XpIkx1I4a7mhoVfPS2VPVD1pMCh+PgxuAHUcEmXw==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.4.tgz", + "integrity": "sha512-J42vLHaYREyiBwH0eQE4/7H1DTfZx8FuxyWSictx4d7ezzuKE3XOkIvOg+SQzRz7T9HLVKzq2tvbAov4UfufBw==", "optional": true }, "@esbuild/linux-ia32": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.3.tgz", - "integrity": "sha512-EyfGWeOwRqK5Xj18vok0qv8IFBZ1/+hKV+cqD44oVhGsxHo9TmPtoSiDrWn8Sa2swq/VuO5Aiog6YPDj81oIkA==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.4.tgz", + "integrity": "sha512-4ksIqFwhq7OExty7Sl1n0vqQSCqTG4sU6i99G2yuMr28CEOUZ/60N+IO9hwI8sIxBqmKmDgncE1n5CMu/3m0IA==", "optional": true }, "@esbuild/linux-loong64": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.3.tgz", - "integrity": "sha512-PwXkcl3t0kSeYH5RuJIeh/fHOzKZd+ZdifAWzpVO+9TLWArutTFBJvOSkTZ3CcqQqNrTj1Qyo6nqE8MQj/a7cQ==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.4.tgz", + "integrity": "sha512-bsWtoVHkGQgAsFXioDueXRiUIfSGrVkJjBBz4gcBJxXcD461cWFQFyu8Fxdj9TP+zEeqJ8C/O4LFFMBNi6Fscw==", "optional": true }, "@esbuild/linux-mips64el": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.3.tgz", - "integrity": "sha512-CRVkkSXf5GQcq7Am2a2tdIn85oqi/bkjuPvhNqcdeTgI0xgNbqLnEPRy2AEGkRuaJWB5uCX1IC4sqnY8ET14Yg==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.4.tgz", + "integrity": "sha512-LRD9Fu8wJQgIOOV1o3nRyzrheFYjxA0C1IVWZ93eNRRWBKgarYFejd5WBtrp43cE4y4D4t3qWWyklm73Mrsd/g==", "optional": true }, "@esbuild/linux-ppc64": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.3.tgz", - "integrity": "sha512-t7zK1Cheh0xvzfZbimztiE0wGnpV+YRsBg3tefcEBN3O4GzgLu6fFpA5HxEyVm3hHZW1jAC4OhoGEp7C5Ii6Eg==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.4.tgz", + "integrity": "sha512-jtQgoZjM92gauVRxNaaG/TpL3Pr4WcL3Pwqi9QgdrBGrEXzB+twohQiWNSTycs6lUygakos4mm2h0B9/SHveng==", "optional": true }, "@esbuild/linux-riscv64": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.3.tgz", - "integrity": "sha512-fUZPtyCYih6y4lDYdSM4Yoax4nS7aH0/XixJStys+9tfp5cAlIAZhEVKOOdeGXmQn0IEyiUtlIsPnfObbeDQfQ==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.4.tgz", + "integrity": "sha512-7WaU/kRZG0VCV09Xdlkg6LNAsfU9SAxo6XEdaZ8ffO4lh+DZoAhGTx7+vTMOXKxa+r2w1LYDGxfJa2rcgagMRA==", "optional": true }, "@esbuild/linux-s390x": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.3.tgz", - "integrity": "sha512-oIcK2LqHWqfMERqjvaKJ3QJmycHn723HsXIv5gH4iGfmePfSj+gi0ZQv2h4bHUg2bs2gJtV0DlIjGhEuvdgxLw==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.4.tgz", + "integrity": "sha512-D19ed0xreKQvC5t+ArE2njSnm18WPpE+1fhwaiJHf+Xwqsq+/SUaV8Mx0M27nszdU+Atq1HahrgCOZCNNEASUg==", "optional": true }, "@esbuild/linux-x64": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.3.tgz", - "integrity": "sha512-RW9lpfZ6XZ6f5to2DJPvt0f/4RXEW229Xf++quVoW+YbnPrcapIJChtD/AmZ8cK3hglO/hXxJjs21pV0/l7L5w==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.4.tgz", + "integrity": "sha512-Rx3AY1sxyiO/gvCGP00nL69L60dfmWyjKWY06ugpB8Ydpdsfi3BHW58HWC24K3CAjAPSwxcajozC2PzA9JBS1g==", "optional": true }, "@esbuild/netbsd-x64": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.3.tgz", - "integrity": "sha512-piZ2oBoaq58pKZvhgdV6PemlL30Uhd9GmmOkIGZYgChwNcyVSSl6iMEJxMzU7x44Lk9q+hJ6a343M/iVEMEvxA==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.4.tgz", + "integrity": "sha512-AaShPmN9c6w1mKRpliKFlaWcSkpBT4KOlk93UfFgeI3F3cbjzdDKGsbKnOZozmYbE1izZKLmNJiW0sFM+A5JPA==", "optional": true }, "@esbuild/openbsd-x64": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.3.tgz", - "integrity": "sha512-vaMfouYTz/4tKdQsXDccqhV6wgPEr+hfuxdNU5Pl/vQxYTsqcXv5DYEa5Z1RAxCoua5aEB+Uj5V7VT/bM92wxw==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.4.tgz", + "integrity": "sha512-tRGvGwou3BrvHVvF8HxTqEiC5VtPzySudS9fh2jBIKpLX7HCW8jIkW+LunkFDNwhslx4xMAgh0jAHsx/iCymaQ==", "optional": true }, "@esbuild/sunos-x64": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.3.tgz", - "integrity": "sha512-Fa3rNQQ9q1qwy9u2cdDvuGKy3jmPnPPMDdyy/qbn5d395Pb9hjLYiPzX9BozXMPJDlCNofSY7jN3miM9gyAdHA==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.4.tgz", + "integrity": "sha512-acORFDI95GKhmAnlH8EarBeuqoy/j3yxIU+FDB91H3+ZON+8HhTadtT450YkaMzX6lEWbhi+mjVUCj00M5yyOQ==", "optional": true }, "@esbuild/win32-arm64": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.3.tgz", - "integrity": "sha512-LPJC8ub+9uzyC6ygVmp00dAqet1q1DsZ/OldGIIBt+y+Ctd1OfnKNlzQgXK8nxwY1G8fAhklFSeSRRgAUJnR0w==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.4.tgz", + "integrity": "sha512-1NxP+iOk8KSvS1L9SSxEvBAJk39U0GiGZkiiJGbuDF9G4fG7DSDw6XLxZMecAgmvQrwwx7yVKdNN3GgNh0UfKg==", "optional": true }, "@esbuild/win32-ia32": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.3.tgz", - "integrity": "sha512-WtUyRspyxZR6NTc2HG4xd9Wvz8lP4C6OUY1gAqisrf151HvXIxsK0mfAacFJNS7EN2wvPTgjP+SM8vgBOx5+zA==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.4.tgz", + "integrity": "sha512-OKr8jze93vbgqZ/r23woWciTixUwLa976C9W7yNBujtnVHyvsL/ocYG61tsktUfJOpyIz5TsohkBZ6Lo2+PCcQ==", "optional": true }, "@esbuild/win32-x64": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.3.tgz", - "integrity": "sha512-Z8qCK4BkBm40j5KUM4NrkxYQS0R12cBO1NBVtI4vws6uwh1n/VaNu31Hm+n2cJUWdFbfH57PBghkhm9yLgmPfw==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.4.tgz", + "integrity": "sha512-qJr3wVvcLjPFcV4AMDS3iquhBfTef2zo/jlm8RMxmiRp3Vy2HY8WMxrykJlcbCnqLXZPA0YZxZGND6eug85ogg==", "optional": true }, "@jridgewell/gen-mapping": { @@ -7896,32 +7896,32 @@ "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==" }, "esbuild": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.3.tgz", - "integrity": "sha512-eadWJC4CRpj93+miO5ZBlvCv+m2x6pzyNBznTvUeLFObMmxs1IMd8cCf6qiDVEZuDL6W8W7u+ZNW3GKEfOdDsA==", + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.4.tgz", + "integrity": "sha512-9rxWV/Cb2DMUXfe9aUsYtqg0KTlw146ElFH22kYeK9KVV1qT082X4lpmiKsa12ePiCcIcB686TQJxaGAa9TFvA==", "requires": { - "@esbuild/android-arm": "0.18.3", - "@esbuild/android-arm64": "0.18.3", - "@esbuild/android-x64": "0.18.3", - "@esbuild/darwin-arm64": "0.18.3", - "@esbuild/darwin-x64": "0.18.3", - "@esbuild/freebsd-arm64": "0.18.3", - "@esbuild/freebsd-x64": "0.18.3", - "@esbuild/linux-arm": "0.18.3", - "@esbuild/linux-arm64": "0.18.3", - "@esbuild/linux-ia32": "0.18.3", - "@esbuild/linux-loong64": "0.18.3", - "@esbuild/linux-mips64el": "0.18.3", - "@esbuild/linux-ppc64": "0.18.3", - "@esbuild/linux-riscv64": "0.18.3", - "@esbuild/linux-s390x": "0.18.3", - "@esbuild/linux-x64": "0.18.3", - "@esbuild/netbsd-x64": "0.18.3", - "@esbuild/openbsd-x64": "0.18.3", - "@esbuild/sunos-x64": "0.18.3", - "@esbuild/win32-arm64": "0.18.3", - "@esbuild/win32-ia32": "0.18.3", - "@esbuild/win32-x64": "0.18.3" + "@esbuild/android-arm": "0.18.4", + "@esbuild/android-arm64": "0.18.4", + "@esbuild/android-x64": "0.18.4", + "@esbuild/darwin-arm64": "0.18.4", + "@esbuild/darwin-x64": "0.18.4", + "@esbuild/freebsd-arm64": "0.18.4", + "@esbuild/freebsd-x64": "0.18.4", + "@esbuild/linux-arm": "0.18.4", + "@esbuild/linux-arm64": "0.18.4", + "@esbuild/linux-ia32": "0.18.4", + "@esbuild/linux-loong64": "0.18.4", + "@esbuild/linux-mips64el": "0.18.4", + "@esbuild/linux-ppc64": "0.18.4", + "@esbuild/linux-riscv64": "0.18.4", + "@esbuild/linux-s390x": "0.18.4", + "@esbuild/linux-x64": "0.18.4", + "@esbuild/netbsd-x64": "0.18.4", + "@esbuild/openbsd-x64": "0.18.4", + "@esbuild/sunos-x64": "0.18.4", + "@esbuild/win32-arm64": "0.18.4", + "@esbuild/win32-ia32": "0.18.4", + "@esbuild/win32-x64": "0.18.4" } }, "escalade": { diff --git a/package.json b/package.json index 55711a0..3aa5eab 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "any-date-parser": "^1.5.4", "browserslist": "^4.21.7", "cheerio": "^1.0.0-rc.12", - "esbuild": "^0.18.3", + "esbuild": "^0.18.4", "fs-cheerio": "^3.0.0", "inline-source": "^8.0.2", "jsdom": "^22.1.0", diff --git a/router.go b/router.go index 43ee80e..261bd97 100644 --- a/router.go +++ b/router.go @@ -226,7 +226,7 @@ func (app *appContext) loadRoutes(router *gin.Engine) { api.POST(p+"/matrix/login", app.MatrixLogin) if userPageEnabled { - user.GET(p+"/hello", app.HelloWorld) + user.GET(p+"/details", app.MyDetails) } } } diff --git a/ts/user.ts b/ts/user.ts index c224bac..fc0eed5 100644 --- a/ts/user.ts +++ b/ts/user.ts @@ -4,6 +4,13 @@ import { Modal } from "./modules/modal.js"; import { _get, _post, notificationBox, whichAnimationEvent } from "./modules/common.js"; import { Login } from "./modules/login.js"; +interface userWindow extends Window { + jellyfinID: string; + username: string; +} + +declare var window: userWindow; + const theme = new ThemeManager(document.getElementById("button-theme")); window.lang = new lang(window.langFile as LangFile); @@ -22,14 +29,20 @@ window.modals = {} as Modals; window.notifications = new notificationBox(document.getElementById('notification-box') as HTMLDivElement, 5); +var rootCard = document.getElementById("card-user"); + const login = new Login(window.modals.login as Modal, "/my/"); login.onLogin = () => { console.log("Logged in."); - document.getElementById("card-user").textContent = "Logged In!"; - _get("/my/hello", null, (req: XMLHttpRequest) => { + _get("/my/details", null, (req: XMLHttpRequest) => { if (req.readyState == 4) { - const card = document.getElementById("card-user"); - card.textContent = card.textContent + " got response " + req.response["response"]; + if (req.status != 200) { + window.notifications.customError("myDetailsError", req.response["error"]); + return; + } + window.jellyfinID = req.response["id"]; + window.username = req.response["username"]; + rootCard.querySelector(".heading").textContent = window.lang.strings("welcomeUser").replace("{user}", window.username); } }); }; diff --git a/views.go b/views.go index 2194b96..a158766 100644 --- a/views.go +++ b/views.go @@ -166,22 +166,22 @@ func (app *appContext) MyUserPage(gc *gin.Context) { notificationsEnabled, _ := app.config.Section("notifications").Key("enabled").Bool() ombiEnabled := app.config.Section("ombi").Key("enabled").MustBool(false) gcHTML(gc, http.StatusOK, "user.html", gin.H{ - "urlBase": app.getURLBase(gc), - "cssClass": app.cssClass, - "cssVersion": cssVersion, - "contactMessage": app.config.Section("ui").Key("contact_message").String(), - "emailEnabled": emailEnabled, - "telegramEnabled": telegramEnabled, - "discordEnabled": discordEnabled, - "matrixEnabled": matrixEnabled, - "ombiEnabled": ombiEnabled, - "linkResetEnabled": app.config.Section("password_resets").Key("link_reset").MustBool(false), - "notifications": notificationsEnabled, - "username": !app.config.Section("email").Key("no_username").MustBool(false), - "strings": app.storage.lang.Admin[lang].Strings, - "quantityStrings": app.storage.lang.Admin[lang].QuantityStrings, - "language": app.storage.lang.Admin[lang].JSON, - "langName": lang, + "urlBase": app.getURLBase(gc), + "cssClass": app.cssClass, + "cssVersion": cssVersion, + "contactMessage": app.config.Section("ui").Key("contact_message").String(), + "emailEnabled": emailEnabled, + "telegramEnabled": telegramEnabled, + "discordEnabled": discordEnabled, + "matrixEnabled": matrixEnabled, + "ombiEnabled": ombiEnabled, + "linkResetEnabled": app.config.Section("password_resets").Key("link_reset").MustBool(false), + "notifications": notificationsEnabled, + "username": !app.config.Section("email").Key("no_username").MustBool(false), + "strings": app.storage.lang.User[lang].Strings, + "validationStrings": app.storage.lang.User[lang].ValidationStrings, + "language": app.storage.lang.User[lang].JSON, + "langName": lang, }) }