From 268592187427646562e10c5b1a6dce1d16aed53a Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Fri, 13 Nov 2020 15:37:06 +0300 Subject: [PATCH 1/2] Update Localization.md --- docs/en/UI/Angular/Localization.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/UI/Angular/Localization.md b/docs/en/UI/Angular/Localization.md index 944fb25458..6c7e6084a6 100644 --- a/docs/en/UI/Angular/Localization.md +++ b/docs/en/UI/Angular/Localization.md @@ -169,7 +169,7 @@ Since ABP has more than one language, Angular locale files loads lazily using [W ### registerLocaleFn -A `registerLocaleFn` is a higher order function that accepts `cultureNameLocaleFileMap` object and `errorHandlerFn` function as params and returns Webpack import function. A `registerLocale` function must be passed to the `forRoot` of the `CoreModule` as shown below: +`registerLocale` function that exported from `@abp/ng.core/locale` package is a higher order function that accepts `cultureNameLocaleFileMap` object and `errorHandlerFn` function as params and returns Webpack `import` function. A `registerLocale` function must be passed to the `forRoot` of the `CoreModule` as shown below: ```js // app.module.ts From fbce554921ba27835d1c0caa035221d56f95ae24 Mon Sep 17 00:00:00 2001 From: Ahmet Date: Fri, 13 Nov 2020 16:44:28 +0300 Subject: [PATCH 2/2] Update ConventionalRouteBuilder.cs --- .../Conventions/ConventionalRouteBuilder.cs | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Conventions/ConventionalRouteBuilder.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Conventions/ConventionalRouteBuilder.cs index 58a59f37e8..cad380fbfe 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Conventions/ConventionalRouteBuilder.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Conventions/ConventionalRouteBuilder.cs @@ -134,26 +134,12 @@ namespace Volo.Abp.AspNetCore.Mvc.Conventions protected virtual string NormalizeIdPropertyNameCase(PropertyInfo property, [CanBeNull] ConventionalControllerSetting configuration) { - if (configuration?.UseV3UrlStyle ?? Options.UseV3UrlStyle) - { - return property.Name; - } - else - { - return property.Name.ToKebabCase(); - } + return property.Name; } protected virtual string NormalizeSecondaryIdNameCase(ParameterModel secondaryId, [CanBeNull] ConventionalControllerSetting configuration) { - if (configuration?.UseV3UrlStyle ?? Options.UseV3UrlStyle) - { - return secondaryId.ParameterName; - } - else - { - return secondaryId.ParameterName.ToKebabCase(); - } + return secondaryId.ParameterName; } } }