RED-3800: fixed generic errors.
This commit is contained in:
parent
b96e55f42c
commit
19ecd12c5f
@ -1,7 +1,7 @@
|
|||||||
import { ErrorHandler, Inject, Injectable, Injector } from '@angular/core';
|
import { ErrorHandler, Inject, Injectable, Injector } from '@angular/core';
|
||||||
import { HttpErrorResponse, HttpStatusCode } from '@angular/common/http';
|
import { HttpErrorResponse, HttpStatusCode } from '@angular/common/http';
|
||||||
import { Toaster } from '@iqser/common-ui';
|
import { Toaster } from '@iqser/common-ui';
|
||||||
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
|
import { genericErrorTranslations } from '@translations/generic-error-translations';
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class GlobalErrorHandler extends ErrorHandler {
|
export class GlobalErrorHandler extends ErrorHandler {
|
||||||
@ -18,7 +18,7 @@ export class GlobalErrorHandler extends ErrorHandler {
|
|||||||
if (err.error.message) {
|
if (err.error.message) {
|
||||||
toaster.rawError(err.error.message);
|
toaster.rawError(err.error.message);
|
||||||
} else if ([400, 403, 404, 409, 500].includes(err.status)) {
|
} else if ([400, 403, 404, 409, 500].includes(err.status)) {
|
||||||
toaster.rawError(_(`generic-errors.${err.status}`));
|
toaster.error(genericErrorTranslations[err.status]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -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'),
|
||||||
|
};
|
||||||
@ -225,7 +225,7 @@
|
|||||||
"actions": {
|
"actions": {
|
||||||
"cancel": "Abbrechen",
|
"cancel": "Abbrechen",
|
||||||
"save": "Speichern",
|
"save": "Speichern",
|
||||||
"save-and-remember": ""
|
"save-and-remember": "Save and remember my choice"
|
||||||
},
|
},
|
||||||
"content": {
|
"content": {
|
||||||
"comment": "Kommentar",
|
"comment": "Kommentar",
|
||||||
@ -1720,6 +1720,13 @@
|
|||||||
},
|
},
|
||||||
"title": "SMTP-Konto konfigurieren"
|
"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": {
|
"help-button": {
|
||||||
"disable": "Hilfemodus deaktivieren",
|
"disable": "Hilfemodus deaktivieren",
|
||||||
"enable": "Hilfemodus aktivieren"
|
"enable": "Hilfemodus aktivieren"
|
||||||
@ -2108,7 +2115,7 @@
|
|||||||
"actions": {
|
"actions": {
|
||||||
"cancel": "Abbrechen",
|
"cancel": "Abbrechen",
|
||||||
"save": "Speichern",
|
"save": "Speichern",
|
||||||
"save-and-remember": ""
|
"save-and-remember": "Save and remember my choice"
|
||||||
},
|
},
|
||||||
"content": {
|
"content": {
|
||||||
"comment": "Kommentar",
|
"comment": "Kommentar",
|
||||||
@ -2205,7 +2212,7 @@
|
|||||||
"actions": {
|
"actions": {
|
||||||
"cancel": "Abbrechen",
|
"cancel": "Abbrechen",
|
||||||
"save": "Speichern",
|
"save": "Speichern",
|
||||||
"save-and-remember": ""
|
"save-and-remember": "Save and remember my choice"
|
||||||
},
|
},
|
||||||
"content": {
|
"content": {
|
||||||
"comment": "Kommentar",
|
"comment": "Kommentar",
|
||||||
@ -2225,7 +2232,7 @@
|
|||||||
"label": "In diesem Kontext aus Dossier entfernen"
|
"label": "In diesem Kontext aus Dossier entfernen"
|
||||||
},
|
},
|
||||||
"in-document": {
|
"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"
|
"label": "Aus Dokument entfernen"
|
||||||
},
|
},
|
||||||
"in-dossier": {
|
"in-dossier": {
|
||||||
@ -2362,13 +2369,13 @@
|
|||||||
},
|
},
|
||||||
"roles": {
|
"roles": {
|
||||||
"inactive": "Inaktiv",
|
"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",
|
"no-role": "Keine Rolle definiert",
|
||||||
"red-admin": "{length, plural, one{Anwendungsadmin} other{Anwendungsadmins}}",
|
"red-admin": "Anwendungsadmin",
|
||||||
"red-manager": "Manager",
|
"red-manager": "Manager",
|
||||||
"red-user": "Benutzer",
|
"red-user": "Benutzer",
|
||||||
"red-user-admin": "{length, plural, one{Benutzeradmin} other{Benutzeradmins}}",
|
"red-user-admin": "{count, plural, one{Benutzeradmin} other{Benutzeradmins}}",
|
||||||
"regular": "{length, plural, one{regulärer} other{reguläre}} Benutzer"
|
"regular": "{number, plural, one{{regulärer Benutzer}} other{reguläre Benutzer}}"
|
||||||
},
|
},
|
||||||
"search-screen": {
|
"search-screen": {
|
||||||
"cols": {
|
"cols": {
|
||||||
|
|||||||
@ -1720,6 +1720,13 @@
|
|||||||
},
|
},
|
||||||
"title": "Configure SMTP account"
|
"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": {
|
"help-button": {
|
||||||
"disable": "Disable help mode",
|
"disable": "Disable help mode",
|
||||||
"enable": "Enable help mode"
|
"enable": "Enable help mode"
|
||||||
@ -2225,7 +2232,7 @@
|
|||||||
"label": "Remove from dossier in this context"
|
"label": "Remove from dossier in this context"
|
||||||
},
|
},
|
||||||
"in-document": {
|
"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"
|
"label": "Remove from document"
|
||||||
},
|
},
|
||||||
"in-dossier": {
|
"in-dossier": {
|
||||||
@ -2362,13 +2369,13 @@
|
|||||||
},
|
},
|
||||||
"roles": {
|
"roles": {
|
||||||
"inactive": "Inactive",
|
"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",
|
"no-role": "No role defined",
|
||||||
"red-admin": "Application {length, plural, one{admin} other{admins}}",
|
"red-admin": "Application admin",
|
||||||
"red-manager": "{length, plural, one{Manager} other{Managers}}",
|
"red-manager": "{count, plural, one{Manager} other{Managers}}",
|
||||||
"red-user": "{length, plural, one{User} other{Users}}",
|
"red-user": "User",
|
||||||
"red-user-admin": "{length, plural, one{User} other{Users}} admin",
|
"red-user-admin": "{count, plural, one{User admin} other{User admin}}",
|
||||||
"regular": "Regular"
|
"regular": "{count, plural, one{regular} other{regular}}"
|
||||||
},
|
},
|
||||||
"search-screen": {
|
"search-screen": {
|
||||||
"cols": {
|
"cols": {
|
||||||
|
|||||||
@ -225,7 +225,7 @@
|
|||||||
"actions": {
|
"actions": {
|
||||||
"cancel": "Abbrechen",
|
"cancel": "Abbrechen",
|
||||||
"save": "Speichern",
|
"save": "Speichern",
|
||||||
"save-and-remember": ""
|
"save-and-remember": "Save and remember my choice"
|
||||||
},
|
},
|
||||||
"content": {
|
"content": {
|
||||||
"comment": "Kommentar",
|
"comment": "Kommentar",
|
||||||
@ -1720,6 +1720,13 @@
|
|||||||
},
|
},
|
||||||
"title": "SMTP-Konto konfigurieren"
|
"title": "SMTP-Konto konfigurieren"
|
||||||
},
|
},
|
||||||
|
"generic-errors": {
|
||||||
|
"400": "",
|
||||||
|
"403": "",
|
||||||
|
"404": "",
|
||||||
|
"409": "",
|
||||||
|
"500": ""
|
||||||
|
},
|
||||||
"help-button": {
|
"help-button": {
|
||||||
"disable": "Hilfemodus deaktivieren",
|
"disable": "Hilfemodus deaktivieren",
|
||||||
"enable": "Hilfemodus aktivieren"
|
"enable": "Hilfemodus aktivieren"
|
||||||
@ -2108,7 +2115,7 @@
|
|||||||
"actions": {
|
"actions": {
|
||||||
"cancel": "Abbrechen",
|
"cancel": "Abbrechen",
|
||||||
"save": "Speichern",
|
"save": "Speichern",
|
||||||
"save-and-remember": ""
|
"save-and-remember": "Save and remember my choice"
|
||||||
},
|
},
|
||||||
"content": {
|
"content": {
|
||||||
"comment": "Kommentar",
|
"comment": "Kommentar",
|
||||||
@ -2205,7 +2212,7 @@
|
|||||||
"actions": {
|
"actions": {
|
||||||
"cancel": "Abbrechen",
|
"cancel": "Abbrechen",
|
||||||
"save": "Speichern",
|
"save": "Speichern",
|
||||||
"save-and-remember": ""
|
"save-and-remember": "Save and remember my choice"
|
||||||
},
|
},
|
||||||
"content": {
|
"content": {
|
||||||
"comment": "Kommentar",
|
"comment": "Kommentar",
|
||||||
@ -2362,13 +2369,13 @@
|
|||||||
},
|
},
|
||||||
"roles": {
|
"roles": {
|
||||||
"inactive": "Inaktiv",
|
"inactive": "Inaktiv",
|
||||||
"manager-admin": "Manager & {length, plural, one{Admin} other{Admins}}",
|
"manager-admin": "Manager & Admin",
|
||||||
"no-role": "Keine Rolle definiert",
|
"no-role": "Keine Rolle definiert",
|
||||||
"red-admin": "{length, plural, one{Anwendungsadmin} other{Anwendungsadmins}}",
|
"red-admin": "Anwendungsadmin",
|
||||||
"red-manager": "Manager",
|
"red-manager": "Manager",
|
||||||
"red-user": "Benutzer",
|
"red-user": "Benutzer",
|
||||||
"red-user-admin": "{length, plural, one{Benutzeradmin} other{Benutzeradmins}}",
|
"red-user-admin": "Benutzeradmin",
|
||||||
"regular": "{length, plural, one{regulärer} other{reguläre}} Benutzer"
|
"regular": "regulärer Benutzer"
|
||||||
},
|
},
|
||||||
"search-screen": {
|
"search-screen": {
|
||||||
"cols": {
|
"cols": {
|
||||||
|
|||||||
@ -1720,6 +1720,13 @@
|
|||||||
},
|
},
|
||||||
"title": "Configure SMTP Account"
|
"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": {
|
"help-button": {
|
||||||
"disable": "Disable help mode",
|
"disable": "Disable help mode",
|
||||||
"enable": "Enable help mode"
|
"enable": "Enable help mode"
|
||||||
@ -2362,12 +2369,12 @@
|
|||||||
},
|
},
|
||||||
"roles": {
|
"roles": {
|
||||||
"inactive": "Inactive",
|
"inactive": "Inactive",
|
||||||
"manager-admin": "Manager & {length, plural, one{Admin} other{Admins}}",
|
"manager-admin": "Manager & admin",
|
||||||
"no-role": "No role defined",
|
"no-role": "No role defined",
|
||||||
"red-admin": "Application {length, plural, one{admin} other{admins}}",
|
"red-admin": "Application admin",
|
||||||
"red-manager": "{length, plural, one{Manager} other{Managers}}",
|
"red-manager": "Manager",
|
||||||
"red-user": "{length, plural, one{User} other{Users}}",
|
"red-user": "User",
|
||||||
"red-user-admin": "{length, plural, one{User} other{Users}} admin",
|
"red-user-admin": "Users admin",
|
||||||
"regular": "Regular"
|
"regular": "Regular"
|
||||||
},
|
},
|
||||||
"search-screen": {
|
"search-screen": {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user