From a9cacbf265526879b7eb5f89fcc0df099edb0e5b Mon Sep 17 00:00:00 2001 From: Samuel Newman Date: Fri, 15 Nov 2024 22:16:57 +0000 Subject: [PATCH] Better error message (+ translations!) (#6349) * clean network errors for new common eerors * translate errors --- src/lib/strings/errors.ts | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/lib/strings/errors.ts b/src/lib/strings/errors.ts index 7d00c5e7f59..1a010fea6a1 100644 --- a/src/lib/strings/errors.ts +++ b/src/lib/strings/errors.ts @@ -1,3 +1,5 @@ +import {t} from '@lingui/macro' + export function cleanError(str: any): string { if (!str) { return '' @@ -6,13 +8,17 @@ export function cleanError(str: any): string { str = str.toString() } if (isNetworkError(str)) { - return 'Unable to connect. Please check your internet connection and try again.' + return t`Unable to connect. Please check your internet connection and try again.` } - if (str.includes('Upstream Failure')) { - return 'The server appears to be experiencing issues. Please try again in a few moments.' + if ( + str.includes('Upstream Failure') || + str.includes('NotEnoughResources') || + str.includes('pipethrough network error') + ) { + return t`The server appears to be experiencing issues. Please try again in a few moments.` } if (str.includes('Bad token scope')) { - return 'This feature is not available while using an App Password. Please sign in with your main password.' + return t`This feature is not available while using an App Password. Please sign in with your main password.` } if (str.startsWith('Error: ')) { return str.slice('Error: '.length)