Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

Merge branch 'nicoleta' into 'master'

Browse Source 
RED-3800: fixed generic errors.

See merge request redactmanager/red-ui!690
This commit is contained in:
Dan Percic 2024-11-12 11:29:03 +01:00
commit e4ce12057b
6 changed files with 66 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/red-ui/src/app/services/global-error-handler.service.ts
View File

@ -1,7 +1,7 @@
import { ErrorHandler, Inject, Injectable, Injector } from '@angular/core';
import { HttpErrorResponse, HttpStatusCode } from '@angular/common/http';
import { Toaster } from '@iqser/common-ui';
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
import { genericErrorTranslations } from '@translations/generic-error-translations';
@Injectable()
export class GlobalErrorHandler extends ErrorHandler {
@ -18,7 +18,7 @@ export class GlobalErrorHandler extends ErrorHandler {
if (err.error.message) {
toaster.rawError(err.error.message);
} else if ([400, 403, 404, 409, 500].includes(err.status)) {
toaster.rawError(_(`generic-errors.${err.status}`));
toaster.error(genericErrorTranslations[err.status]);
}
}
}

9
apps/red-ui/src/app/translations/generic-error-translations.ts Normal file
View File

@ -0,0 +1,9 @@
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
export const genericErrorTranslations: { [key: number]: string } = {
400: _('generic-errors.400'),
403: _('generic-errors.403'),
404: _('generic-errors.404'),
409: _('generic-errors.409'),
500: _('generic-errors.500'),
};

23
apps/red-ui/src/assets/i18n/redact/de.json
View File

@ -225,7 +225,7 @@
"actions": {
"cancel": "Abbrechen",
"save": "Speichern",
"save-and-remember": ""
"save-and-remember": "Save and remember my choice"
},
"content": {
"comment": "Kommentar",
@ -1720,6 +1720,13 @@
},
"title": "SMTP-Konto konfigurieren"
},
"generic-errors": {
"400": "Die gesendete Anfrage ist ungültig.",
"403": "Der Zugriff auf die angeforderte Ressource ist nicht erlaubt.",
"404": "Die angeforderte Ressource konnte nicht gefunden werden.",
"409": "Die Anfrage ist mit dem aktuellen Zustand nicht vereinbar.",
"500": "Der Server ist auf eine unerwartete Bedingung gestoßen, die ihn daran hindert, die Anfrage zu erfüllen."
},
"help-button": {
"disable": "Hilfemodus deaktivieren",
"enable": "Hilfemodus aktivieren"
@ -2108,7 +2115,7 @@
"actions": {
"cancel": "Abbrechen",
"save": "Speichern",
"save-and-remember": ""
"save-and-remember": "Save and remember my choice"
},
"content": {
"comment": "Kommentar",
@ -2205,7 +2212,7 @@
"actions": {
"cancel": "Abbrechen",
"save": "Speichern",
"save-and-remember": ""
"save-and-remember": "Save and remember my choice"
},
"content": {
"comment": "Kommentar",
@ -2225,7 +2232,7 @@
"label": "In diesem Kontext aus Dossier entfernen"
},
"in-document": {
"description": "{isImage, select, image{Das Bild} other{Der Begriff}} wird auf keiner Seite dieses Dokuments automatisch geschwärzt.",
"description": "{isImage, select, image{{number, plural, one{Das Bild} other{Die Bilder}}} other{{number, plural, one{Der Begriff} other{Die Begriffe}}}} werden auf keiner Seite dieses Dokuments automatisch geschwärzt.\n",
"label": "Aus Dokument entfernen"
},
"in-dossier": {
@ -2362,13 +2369,13 @@
},
"roles": {
"inactive": "Inaktiv",
"manager-admin": "Manager & {length, plural, one{Admin} other{Admins}}",
"manager-admin": "{count, plural, one{Manager & Admin} other{Manager & Admins}}",
"no-role": "Keine Rolle definiert",
"red-admin": "{length, plural, one{Anwendungsadmin} other{Anwendungsadmins}}",
"red-admin": "Anwendungsadmin",
"red-manager": "Manager",
"red-user": "Benutzer",
"red-user-admin": "{length, plural, one{Benutzeradmin} other{Benutzeradmins}}",
"regular": "{length, plural, one{regulärer} other{reguläre}} Benutzer"
"red-user-admin": "{count, plural, one{Benutzeradmin} other{Benutzeradmins}}",
"regular": "{number, plural, one{{regulärer Benutzer}} other{reguläre Benutzer}}"
},
"search-screen": {
"cols": {

21
apps/red-ui/src/assets/i18n/redact/en.json
View File

@ -1720,6 +1720,13 @@
},
"title": "Configure SMTP account"
},
"generic-errors": {
"400": "The sent request is invalid.",
"403": "Access to the requested resource is not allowed.",
"404": "The requested resource could not be found.",
"409": "The request is incompatible with the current state.",
"500": "The server encountered an unexpected condition that prevented it from fulfilling the request."
},
"help-button": {
"disable": "Disable help mode",
"enable": "Enable help mode"
@ -2225,7 +2232,7 @@
"label": "Remove from dossier in this context"
},
"in-document": {
"description": "Do not auto-redact the selected {isImage, select, image{image} other{term}} on any page of this document.",
"description": "Do not auto-redact the selected {isImage, select, image{{number, plural, one{image} other{images}}} other{{number, plural, one{term} other{terms}}}} on any page of this document.\n",
"label": "Remove from document"
},
"in-dossier": {
@ -2362,13 +2369,13 @@
},
"roles": {
"inactive": "Inactive",
"manager-admin": "Manager & {length, plural, one{Admin} other{Admins}}",
"manager-admin": "{count, plural, one{Manager & admin} other{Manager & admin}}",
"no-role": "No role defined",
"red-admin": "Application {length, plural, one{admin} other{admins}}",
"red-manager": "{length, plural, one{Manager} other{Managers}}",
"red-user": "{length, plural, one{User} other{Users}}",
"red-user-admin": "{length, plural, one{User} other{Users}} admin",
"regular": "Regular"
"red-admin": "Application admin",
"red-manager": "{count, plural, one{Manager} other{Managers}}",
"red-user": "User",
"red-user-admin": "{count, plural, one{User admin} other{User admin}}",
"regular": "{count, plural, one{regular} other{regular}}"
},
"search-screen": {
"cols": {

21
apps/red-ui/src/assets/i18n/scm/de.json
View File

@ -225,7 +225,7 @@
"actions": {
"cancel": "Abbrechen",
"save": "Speichern",
"save-and-remember": ""
"save-and-remember": "Save and remember my choice"
},
"content": {
"comment": "Kommentar",
@ -1720,6 +1720,13 @@
},
"title": "SMTP-Konto konfigurieren"
},
"generic-errors": {
"400": "",
"403": "",
"404": "",
"409": "",
"500": ""
},
"help-button": {
"disable": "Hilfemodus deaktivieren",
"enable": "Hilfemodus aktivieren"
@ -2108,7 +2115,7 @@
"actions": {
"cancel": "Abbrechen",
"save": "Speichern",
"save-and-remember": ""
"save-and-remember": "Save and remember my choice"
},
"content": {
"comment": "Kommentar",
@ -2205,7 +2212,7 @@
"actions": {
"cancel": "Abbrechen",
"save": "Speichern",
"save-and-remember": ""
"save-and-remember": "Save and remember my choice"
},
"content": {
"comment": "Kommentar",
@ -2362,13 +2369,13 @@
},
"roles": {
"inactive": "Inaktiv",
"manager-admin": "Manager & {length, plural, one{Admin} other{Admins}}",
"manager-admin": "Manager & Admin",
"no-role": "Keine Rolle definiert",
"red-admin": "{length, plural, one{Anwendungsadmin} other{Anwendungsadmins}}",
"red-admin": "Anwendungsadmin",
"red-manager": "Manager",
"red-user": "Benutzer",
"red-user-admin": "{length, plural, one{Benutzeradmin} other{Benutzeradmins}}",
"regular": "{length, plural, one{regulärer} other{reguläre}} Benutzer"
"red-user-admin": "Benutzeradmin",
"regular": "regulärer Benutzer"
},
"search-screen": {
"cols": {

17
apps/red-ui/src/assets/i18n/scm/en.json
View File

@ -1720,6 +1720,13 @@
},
"title": "Configure SMTP Account"
},
"generic-errors": {
"400": "The sent request is not valid.",
"403": "Access to the requested resource is not allowed.",
"404": "The requested resource could not be found.",
"409": "The request is incompatible with the current state.",
"500": "The server encountered an unexpected condition that prevented it from fulfilling the request."
},
"help-button": {
"disable": "Disable help mode",
"enable": "Enable help mode"
@ -2362,12 +2369,12 @@
},
"roles": {
"inactive": "Inactive",
"manager-admin": "Manager & {length, plural, one{Admin} other{Admins}}",
"manager-admin": "Manager & admin",
"no-role": "No role defined",
"red-admin": "Application {length, plural, one{admin} other{admins}}",
"red-manager": "{length, plural, one{Manager} other{Managers}}",
"red-user": "{length, plural, one{User} other{Users}}",
"red-user-admin": "{length, plural, one{User} other{Users}} admin",
"red-admin": "Application admin",
"red-manager": "Manager",
"red-user": "User",
"red-user-admin": "Users admin",
"regular": "Regular"
},
"search-screen": {