Merge branch 'intuitem:main' into mcas

intuitem · May 31, 2024 · ded6b87 · ded6b87
2 parents 4643b2e + bbadc91
commit ded6b87
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
@@ -474,7 +474,7 @@
 	"attachmentDeleted": "The attachment has been successfully deleted",
 	"librarySuccessfullyLoaded": "The library has been successfully loaded",
 	"noLibraryDetected": "No library detected",
-	"errorImportingLibrary": "Error importing library",
+	"errorLoadingLibrary": "Error loading library",
 	"updateThisLibrary": "Update this library",
 	"librarySuccessfullyUpdated": "Library successfully updated",
 	"libraryNotFound": "Library not found",
@@ -504,8 +504,8 @@
 	"lowSOK": "The strength of the knowledge supporting the assessment is low",
 	"mediumSOK": "The strength of the knowledge supporting the assessment is medium",
 	"highSOK": "The strength of the knowledge supporting the assessment is high",
-	"libraryImportError": "An error occurred during the importation of your library.",
-	"libraryAlreadyLoadedError": "This library has already been loaded.",
+	"libraryLoadingError": "An error occurred during the load of your library",
+	"libraryAlreadyLoadedError": "This library has already been loaded",
 	"invalidLibraryFileError": "Invalid library file. Please make sure the format is correct.",
 	"taintedFormMessage": "Do you want to leave this page? Changes you made may not be saved.",
 	"riskScenariosStatus": "Risk scenarios status",

diff --git a/frontend/messages/fr.json b/frontend/messages/fr.json
@@ -474,7 +474,7 @@
 	"attachmentDeleted": "La pièce jointe a été supprimée avec succès",
 	"librarySuccessfullyLoaded": "La bibliothèque a été chargée avec succès",
 	"noLibraryDetected": "Aucune bibliothèque détectée",
-	"errorImportingLibrary": "Erreur lors de l'importation de la bibliothèque",
+	"errorLoadingLibrary": "Erreur lors du chargement de la bibliothèque",
 	"updateThisLibrary": "Mettre à jour cette bibliothèque",
 	"librarySuccessfullyUpdated": "La bibliothèque a mise à jour avec succès",
 	"libraryNotFound": "Bibliothèque introuvable",
@@ -504,8 +504,8 @@
 	"lowSOK": "La force des connaissances à l’appui de l’évaluation est faible",
 	"mediumSOK": "La force des connaissances à l’appui de l’évaluation est moyenne",
 	"highSOK": "La force des connaissances à l’appui de l’évaluation est élevée",
-	"libraryImportError": "Une erreur a été détectée durant l'importation de votre librairie.",
-	"libraryAlreadyLoadedError": "Cette librairie a déjà été chargée.",
+	"libraryLoadingError": "Une erreur a été détectée durant le chargement de votre librairie",
+	"libraryAlreadyLoadedError": "Cette librairie a déjà été chargée",
 	"invalidLibraryFileError": "Fichier de bibliothèque invalide. Veuillez vérifier le format du fichier.",
 	"taintedFormMessage": "Voulez-vous vraiment quitter cette page ? Toutes les données non enregistrées seront perdues.",
 	"riskScenariosStatus": "Statut des scénarios de risque",

diff --git a/frontend/messages/pt.json b/frontend/messages/pt.json
@@ -474,7 +474,7 @@
 	"attachmentDeleted": "O anexo foi excluído com sucesso",
 	"librarySuccessfullyLoaded": "A biblioteca foi carregada com sucesso",
 	"noLibraryDetected": "Nenhuma biblioteca detectada",
-	"errorImportingLibrary": "Erro ao importar a biblioteca",
+	"errorLoadingLibrary": "Erro ao carregar a biblioteca",
 	"updateThisLibrary": "Atualizar esta biblioteca",
 	"librarySuccessfullyUpdated": "Biblioteca actualizada com sucesso",
 	"libraryNotFound": "Biblioteca não encontrada",
@@ -504,8 +504,8 @@
 	"lowSOK": "A força do conhecimento que sustenta a avaliação é baixa",
 	"mediumSOK": "A força do conhecimento que sustenta a avaliação é média",
 	"highSOK": "A força do conhecimento que sustenta a avaliação é alta",
-	"libraryImportError": "Ocorreu um erro durante a importação da sua biblioteca.",
-	"libraryAlreadyLoadedError": "Esta biblioteca já foi carregada.",
+	"libraryLoadingError": "Ocorreu um erro durante a importação da sua biblioteca",
+	"libraryAlreadyLoadedError": "Esta biblioteca já foi carregada",
 	"invalidLibraryFileError": "Arquivo de biblioteca inválido. Certifique-se de que o formato está correto.",
 	"taintedFormMessage": "Você deseja sair desta página? As alterações que você fez podem não ser salvas.",
 	"riskScenariosStatus": "Status dos cenários de risco",

diff --git a/frontend/src/lib/utils/locales.ts b/frontend/src/lib/utils/locales.ts
@@ -341,7 +341,7 @@ export function localItems(languageTag: string): LocalItems {
 		lowSOK: m.lowSOK({ languageTag: languageTag }),
 		mediumSOK: m.mediumSOK({ languageTag: languageTag }),
 		highSOK: m.highSOK({ languageTag: languageTag }),
-		libraryImportError: m.libraryImportError({ languageTag: languageTag }),
+		libraryLoadingError: m.libraryLoadingError({ languageTag: languageTag }),
 		libraryAlreadyExistsError: m.libraryAlreadyLoadedError({ languageTag: languageTag }),
 		invalidLibraryFileError: m.invalidLibraryFileError({ languageTag: languageTag }),
 		libraryNotFound: m.libraryNotFound({ languageTag: languageTag }),

diff --git a/frontend/src/routes/(app)/libraries/+page.server.ts b/frontend/src/routes/(app)/libraries/+page.server.ts
@@ -100,7 +100,7 @@ export const actions: Actions = {
 
 				const translate_error = localItems(languageTag())[response.error];
 				const toast_error_message =
-					translate_error ?? m.libraryImportError() + '(' + response.error + ')';
+					translate_error ?? m.libraryLoadingError() + '(' + response.error + ')';
 
 				setFlash({ type: 'error', message: toast_error_message }, event);
 				return fail(400, { form });

diff --git a/frontend/src/routes/(app)/libraries/[id=urn]/+page.server.ts b/frontend/src/routes/(app)/libraries/[id=urn]/+page.server.ts
@@ -13,7 +13,7 @@ export const actions: Actions = {
 			const response = await res.json();
 			console.error('server response:', response);
 			setFlash({ type: 'error', message: response.error }, event);
-			return fail(400, { error: m.errorImportingLibrary() });
+			return fail(400, { error: m.errorLoadingLibrary() });
 		}
 		setFlash(
 			{