Skip to content

Commit a194789

Browse files
authored
Merge pull request #23771 from abpframework/EntityNotFoundErrorMessageWithoutId
Add localized error message for entity not found without ID
2 parents b8a0618 + c31b351 commit a194789

File tree

28 files changed

+31
-7
lines changed

28 files changed

+31
-7
lines changed

framework/src/Volo.Abp.ExceptionHandling/Volo/Abp/AspNetCore/ExceptionHandling/DefaultExceptionToErrorInfoConverter.cs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -195,13 +195,10 @@ protected virtual RemoteServiceErrorInfo CreateEntityNotFoundError(EntityNotFoun
195195
{
196196
if (exception.EntityType != null)
197197
{
198-
return new RemoteServiceErrorInfo(
199-
string.Format(
200-
L["EntityNotFoundErrorMessage"],
201-
exception.EntityType.Name,
202-
exception.Id
203-
)
204-
);
198+
var message = exception.Id != null
199+
? string.Format(L["EntityNotFoundErrorMessage"], exception.EntityType.Name, exception.Id)
200+
: string.Format(L["EntityNotFoundErrorMessageWithoutId"], exception.EntityType.Name);
201+
return new RemoteServiceErrorInfo(message);
205202
}
206203

207204
return new RemoteServiceErrorInfo(exception.Message);

framework/src/Volo.Abp.ExceptionHandling/Volo/Abp/ExceptionHandling/Localization/ar.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"DefaultErrorMessage404": "المورد غير موجود!",
1414
"DefaultErrorMessage404Detail": "لم يتم العثور على المورد المطلوب على الخادم!",
1515
"EntityNotFoundErrorMessage": "لا يوجد كيان {0} بالمعرف = {1}!",
16+
"EntityNotFoundErrorMessageWithoutId": "لا يوجد كيان {0}!",
1617
"AbpDbConcurrencyErrorMessage": "تم تغيير البيانات التي قدمتها بالفعل من قبل مستخدم/عميل آخر. يرجى تجاهل التغييرات التي قمت بها والمحاولة من البداية.",
1718
"Error": "خطأ",
1819
"UnhandledException": "استثناء غير معالج!",

framework/src/Volo.Abp.ExceptionHandling/Volo/Abp/ExceptionHandling/Localization/cs.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"DefaultErrorMessage404": "Prostředek nenalezen!",
1414
"DefaultErrorMessage404Detail": "Vyžádaný prostředek nebyl na serveru nalezen!",
1515
"EntityNotFoundErrorMessage": "Neexistující entita {0} s id = {1}!",
16+
"EntityNotFoundErrorMessageWithoutId": "Neexistující entita {0}!",
1617
"AbpDbConcurrencyErrorMessage": "Údaje, které jste odeslali, již změnil jiný uživatel/klient. Zahoďte provedené změny a zkuste to od začátku.",
1718
"Error": "Chyba",
1819
"UnhandledException": "Neošetřená výjimka!",

framework/src/Volo.Abp.ExceptionHandling/Volo/Abp/ExceptionHandling/Localization/de.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"DefaultErrorMessage404": "Ressource nicht gefunden!",
1414
"DefaultErrorMessage404Detail": "Die angeforderte Ressource konnte nicht auf dem Server gefunden werden!",
1515
"EntityNotFoundErrorMessage": "Es gibt keine Entität {0} mit id = {1}!",
16+
"EntityNotFoundErrorMessageWithoutId": "Es gibt keine Entität {0}!",
1617
"AbpDbConcurrencyErrorMessage": "Die von Ihnen übermittelten Daten wurden bereits von einem anderen Benutzer/Kunden geändert. Bitte verwerfen Sie die vorgenommenen Änderungen und versuchen Sie es von vorne.",
1718
"Error": "Fehler",
1819
"UnhandledException": "Unbehandelte Ausnahme!",

framework/src/Volo.Abp.ExceptionHandling/Volo/Abp/ExceptionHandling/Localization/el.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"DefaultErrorMessage404": "Ο πόρος δεν βρέθηκε!",
1414
"DefaultErrorMessage404Detail": "Ο πόρος που ζητήθηκε δεν βρέθηκε στον διακομιστή!",
1515
"EntityNotFoundErrorMessage": "Δεν υπάρχει οντότητα {0} με id = {1}!",
16+
"EntityNotFoundErrorMessageWithoutId": "Δεν υπάρχει οντότητα {0}!",
1617
"AbpDbConcurrencyErrorMessage": "Τα δεδομένα που έχετε υποβάλλει έχουν ήδη τροποποιηθεί από άλλον χρήστη/πελάτη. Απορρίψτε τις αλλαγές που κάνατε και δοκιμάστε από την αρχή.",
1718
"Error": "Σφάλμα",
1819
"UnhandledException": "Απρόσμενη Εξαίρεση!",

framework/src/Volo.Abp.ExceptionHandling/Volo/Abp/ExceptionHandling/Localization/en-GB.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"DefaultErrorMessage404": "Resource not found!",
1414
"DefaultErrorMessage404Detail": "The resource requested could not be found on the server!",
1515
"EntityNotFoundErrorMessage": "There is no entity {0} with id = {1}!",
16+
"EntityNotFoundErrorMessageWithoutId": "There is no entity {0}!",
1617
"Error": "Error",
1718
"UnhandledException": "Unhandled exception!",
1819
"Authorizing": "Authorizing…",

framework/src/Volo.Abp.ExceptionHandling/Volo/Abp/ExceptionHandling/Localization/en.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"DefaultErrorMessage404": "Resource not found!",
1414
"DefaultErrorMessage404Detail": "The resource requested could not be found on the server!",
1515
"EntityNotFoundErrorMessage": "There is no entity {0} with id = {1}!",
16+
"EntityNotFoundErrorMessageWithoutId": "There is no entity {0}!",
1617
"AbpDbConcurrencyErrorMessage": "The data you have submitted has already been changed by another user. Discard your changes and try again.",
1718
"Error": "Error",
1819
"UnhandledException": "Unhandled exception!",

framework/src/Volo.Abp.ExceptionHandling/Volo/Abp/ExceptionHandling/Localization/es.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"DefaultErrorMessage404": "Recurso no encontrado!",
1414
"DefaultErrorMessage404Detail": "El recurso solitiado podría no encontrarse en el servidor!",
1515
"EntityNotFoundErrorMessage": "No hay una entidad {0} con id = {1}!",
16+
"EntityNotFoundErrorMessageWithoutId": "No hay una entidad {0}!",
1617
"AbpDbConcurrencyErrorMessage": "Los datos que ha enviado ya han sido modificados por otro usuario/cliente. Descarte los cambios que ha realizado e inténtelo desde el principio.",
1718
"Error": "Error",
1819
"UnhandledException": "Excepción no manejada!",

framework/src/Volo.Abp.ExceptionHandling/Volo/Abp/ExceptionHandling/Localization/fa.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"DefaultErrorMessage404": "منبع درخواستی یافت نشد!",
1414
"DefaultErrorMessage404Detail": "منبع درخواستی در سرور یافت نشد!",
1515
"EntityNotFoundErrorMessage": "هیچ موجودیتی {0} با id = {1} وجود ندارد!",
16+
"EntityNotFoundErrorMessageWithoutId": "هیچ موجودیتی {0} وجود ندارد!",
1617
"AbpDbConcurrencyErrorMessage": "اطلاعات ارسالی شما قبلاً توسط کاربر/مشتری دیگری تغییر یافته است. لطفاً تغییراتی را که انجام داده اید لغو کنید و مجددا تلاش فرمایید.",
1718
"Error": "خطا",
1819
"UnhandledException": "خطای پیش بینی نشده!",

framework/src/Volo.Abp.ExceptionHandling/Volo/Abp/ExceptionHandling/Localization/fi.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"DefaultErrorMessage404": "Resurssia ei löydy!",
1414
"DefaultErrorMessage404Detail": "Pyydettyä resurssia ei löytynyt palvelimelta!",
1515
"EntityNotFoundErrorMessage": "Ei ole olemassa kohdetta {0}, jonka tunnus = {1}!",
16+
"EntityNotFoundErrorMessageWithoutId": "Ei ole olemassa kohdetta {0}!",
1617
"AbpDbConcurrencyErrorMessage": "Toinen käyttäjä/asiakas on jo muuttanut lähettämiäsi tietoja. Hylkää tekemäsi muutokset ja yritä alusta.",
1718
"Error": "Virhe",
1819
"UnhandledException": "Käsittelemätön poikkeus!",

0 commit comments

Comments
 (0)