Merge remote-tracking branch 'origin/rel-4.0' into dev

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

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;
         }
     }
 }