From 0d75b56d19888359ead11964a1b5f3ec12939fa3 Mon Sep 17 00:00:00 2001 From: MathieuG-P <40181755+Zagrios@users.noreply.github.com> Date: Sun, 6 Aug 2023 15:39:12 +0200 Subject: [PATCH] [feature] Correct translation + adjust qr code color with loght theme --- assets/jsons/translations/de.json | 2 +- assets/jsons/translations/en.json | 2 +- assets/jsons/translations/es.json | 2 +- assets/jsons/translations/fr.json | 2 +- assets/jsons/translations/ru.json | 2 +- .../components/modal/modal-types/login-modal.component.tsx | 4 ++-- src/renderer/components/shared/bsm-button.component.tsx | 2 +- src/renderer/services/bs-downloader.service.ts | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/assets/jsons/translations/de.json b/assets/jsons/translations/de.json index 6031f682..89ad8891 100644 --- a/assets/jsons/translations/de.json +++ b/assets/jsons/translations/de.json @@ -231,7 +231,7 @@ "401": "Steam scheint uns BeatSaber nicht herunterladen zu lassen 😢", "404": "Steam-Server können nicht kontaktiert werden.", "Password": "Passwort ist ungültig.", - "InvalidCredentials": "Deine E-Mail oder Passwort ist ungültig 😴", + "InvalidCredentials": "Ungültige Anmeldedaten, nicht genehmigte Verbindung oder zu viele Anmeldeversuche.", "NoManifest": "Es wurde keine Manifest gefunden", "DirectoryCreate": "Die erforderlichen Ordner können nicht installiert werden.", "NotAvailableApp": "Versuchst du, Beat Saber herunterzuladen, wenn Du es nicht hast? 🤣", diff --git a/assets/jsons/translations/en.json b/assets/jsons/translations/en.json index b5180113..84a3836e 100644 --- a/assets/jsons/translations/en.json +++ b/assets/jsons/translations/en.json @@ -231,7 +231,7 @@ "401": "Steam doesn't seem to want to let us download Beat Saber 😢", "404": "Unable to contact Steam servers.", "Password": "Password is invalid.", - "InvalidCredentials": "Your e-mail or password is invalid 😴", + "InvalidCredentials": "Invalid login credentials, unapproved connection, or too many login attempts.", "NoManifest": "No manifest was found", "DirectoryCreate": "Unable to install the necessary folders.", "NotAvailableApp": "Are you trying to download Beat Saber when you don't have it? 🤣", diff --git a/assets/jsons/translations/es.json b/assets/jsons/translations/es.json index d212a5e9..92c52d44 100644 --- a/assets/jsons/translations/es.json +++ b/assets/jsons/translations/es.json @@ -230,7 +230,7 @@ "401": "Parece que Steam no quiere dejarnos descargar BeatSaber 😢", "404": "No se puede contactar con los servidores de Steam", "Password": "La contraseña es inválida.", - "InvalidCredentials": "Su correo electrónico o contraseña no son válidos 😴", + "InvalidCredentials": "Credenciales de inicio de sesión inválidas, conexión no aprobada, o demasiados intentos de inicio de sesión.", "NoManifest": "No se ha encontrado el manifiesto", "DirectoryCreate": "No se pueden instalar las carpetas necesarias.", "NotAvailableApp": "¿Intentas descargar BeatSaber cuando no lo tienes? 🤣", diff --git a/assets/jsons/translations/fr.json b/assets/jsons/translations/fr.json index 4f8f6f4a..db9b9831 100644 --- a/assets/jsons/translations/fr.json +++ b/assets/jsons/translations/fr.json @@ -227,7 +227,7 @@ "401": "Steam ne semble pas vouloir nous laisser télécharger Beat Saber 😢", "404": "Impossible de contacter les serveurs de Steam.", "Password": "Le mot de passe est invalide.", - "InvalidCredentials": "Ton e-mail ou mot de passe est invalide 😴", + "InvalidCredentials": "Identifiants de connexion invalides, connexion non approuvée, ou trop de tentatives de connexion.", "NoManifest": "Aucun manifest n'a été trouvé.", "DirectoryCreate": "Impossible d'installer les dossiers nécessaires.", "NotAvailableApp": "Tu essayes de télécharger Beat Saber alors que tu ne l'as pas ? 🤣", diff --git a/assets/jsons/translations/ru.json b/assets/jsons/translations/ru.json index cf2caff4..b1e137cd 100644 --- a/assets/jsons/translations/ru.json +++ b/assets/jsons/translations/ru.json @@ -231,7 +231,7 @@ "401": "Похоже Steam не хочет, чтобы мы скачали Beat Saber 😢", "404": "Нет связи с серверами Steam.", "Password": "Неверный пароль.", - "InvalidCredentials": "Ваша почта или пароль неверны 😴", + "InvalidCredentials": "Неверные учетные данные для входа, неразрешенное соединение или слишком много попыток входа.", "NoManifest": "Файл манифеста не найден", "DirectoryCreate": "Не смогли создать нужные папки.", "NotAvailableApp": "Вы пытаетесь скачать Beat Saber, не купив её? 🤣", diff --git a/src/renderer/components/modal/modal-types/login-modal.component.tsx b/src/renderer/components/modal/modal-types/login-modal.component.tsx index 9a3ffd99..9820f34a 100644 --- a/src/renderer/components/modal/modal-types/login-modal.component.tsx +++ b/src/renderer/components/modal/modal-types/login-modal.component.tsx @@ -83,9 +83,9 @@ export const LoginModal: ModalComponent<
{t("modals.steam-login.inputs.qr.label")} -
+
{(qrCodeUrl ? - : + : )}
diff --git a/src/renderer/components/shared/bsm-button.component.tsx b/src/renderer/components/shared/bsm-button.component.tsx index 79303f1c..351ef8a8 100644 --- a/src/renderer/components/shared/bsm-button.component.tsx +++ b/src/renderer/components/shared/bsm-button.component.tsx @@ -72,7 +72,7 @@ export function BsmButton({ className, style, imgClassName, iconClassName, icon, const handleClick = (e: MouseEvent) => !disabled && onClick?.(e); return ( -
+
{image && } {icon && } {text && diff --git a/src/renderer/services/bs-downloader.service.ts b/src/renderer/services/bs-downloader.service.ts index b8b72e9b..778b1fff 100644 --- a/src/renderer/services/bs-downloader.service.ts +++ b/src/renderer/services/bs-downloader.service.ts @@ -172,10 +172,10 @@ export class BsDownloaderService { const handledErrors = Object.values(DepotDownloaderErrorEvent); if(handledErrors.includes(errorEvent?.subType as DepotDownloaderErrorEvent)){ - return this.notificationService.notifyError({title: "notifications.types.error", desc: `notifications.bs-download.errors.msg.${errorEvent.subType}`}); + return this.notificationService.notifyError({title: "notifications.types.error", desc: `notifications.bs-download.errors.msg.${errorEvent.subType}`, duration: 10_000}); } - return this.notificationService.notifyError({title: "notifications.types.error", desc: `notifications.bs-download.errors.msg.${DepotDownloaderErrorEvent.Unknown}`}); + return this.notificationService.notifyError({title: "notifications.types.error", desc: `notifications.bs-download.errors.msg.${DepotDownloaderErrorEvent.Unknown}`, duration: 10_000}); } private wrapDownload(download$: Observable, silent?: boolean): Observable {