Browse Source
Merge pull request #18392 from gentledepp/fix/18391
#18391 - corrected some messages to return proper english
pull/18422/head
maliming
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with
5 additions and
5 deletions
framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainer.cs
framework/src/Volo.Abp.ExceptionHandling/Volo/Abp/ExceptionHandling/Localization/en-GB.json
framework/src/Volo.Abp.ExceptionHandling/Volo/Abp/ExceptionHandling/Localization/en.json
framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/ApiDescriptionFinder.cs
framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/BlobContainer_Tests.cs
@ -179,7 +179,7 @@ public class BlobContainer : IBlobContainer
{
//TODO: Consider to throw some type of "not found" exception and handle on the HTTP status side
throw new AbpException (
$"Could not fou nd the requested BLOB '{name}' in the container '{ContainerName}'!" ) ;
$"Could not fi nd the requested BLOB '{name}' in the container '{ContainerName}'!" ) ;
}
return stream ;
@ -11,7 +11,7 @@
"DefaultErrorMessage403" : "You are not authorised!" ,
"DefaultErrorMessage403Detail" : "You are not allowed to perform this operation!" ,
"DefaultErrorMessage404" : "Resource not found!" ,
"DefaultErrorMessage404Detail" : "The resource requested could not found on the server!" ,
"DefaultErrorMessage404Detail" : "The resource requested could not be found on the server!" ,
"EntityNotFoundErrorMessage" : "There is no entity {0} with id = {1}!" ,
"Error" : "Error" ,
"UnhandledException" : "Unhandled exception!" ,
@ -11,7 +11,7 @@
"DefaultErrorMessage403" : "You are not authorized!" ,
"DefaultErrorMessage403Detail" : "You are not allowed to perform this operation!" ,
"DefaultErrorMessage404" : "Resource not found!" ,
"DefaultErrorMessage404Detail" : "The resource requested could not found on the server!" ,
"DefaultErrorMessage404Detail" : "The resource requested could not be found on the server!" ,
"EntityNotFoundErrorMessage" : "There is no entity {0} with id = {1}!" ,
"AbpDbConcurrencyErrorMessage" : "The data you have submitted has already changed by another user/client. Please discard the changes you've done and try from the beginning." ,
"Error" : "Error" ,
@ -82,7 +82,7 @@ public class ApiDescriptionFinder : IApiDescriptionFinder, ITransientDependency
}
}
throw new AbpException ( $"Could not fou nd remote action for method: {method} on the URL: {baseUrl}" ) ;
throw new AbpException ( $"Could not fi nd remote action for method: {method} on the URL: {baseUrl}" ) ;
}
public virtual async Task < ApplicationApiDescriptionModel > GetApiDescriptionAsync ( HttpClient client , string baseUrl )
@ -61,7 +61,7 @@ public abstract class BlobContainer_Tests<TStartupModule> : AbpIntegratedTest<TS
using ( CurrentTenant . Change ( null ) )
{
// Could not fou nd the requested BLOB...
// Could not fi nd the requested BLOB...
await Assert . ThrowsAsync < AbpException > ( async ( ) = >
await Container . GetAllBytesAsync ( blobName )
) ;