Enhancement IQueryStringCultureReplacement.

5 years ago · 851cfd69ba
1 changed files with 4 additions and 3 deletions
--- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Localization/AbpAspNetCoreMvcQueryStringCultureReplacement.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Localization/AbpAspNetCoreMvcQueryStringCultureReplacement.cs
@ -16,12 +16,13 @@ namespace Volo.Abp.AspNetCore.Mvc.Localization
                {
                    context.ReturnUrl = Regex.Replace(
                        context.ReturnUrl,
-                        "culture=[A-Za-z-]+?&",
-                        $"culture={context.RequestCulture.Culture}&",
+                        "culture=[A-Za-z-]+",
+                        $"culture={context.RequestCulture.Culture}",
                        RegexOptions.Compiled | RegexOptions.IgnoreCase);

                    context.ReturnUrl = Regex.Replace(
-                        context.ReturnUrl, "ui-culture=[A-Za-z-]+?$",
+                        context.ReturnUrl,
+                        "ui-culture=[A-Za-z-]+",
                        $"ui-culture={context.RequestCulture.UICulture}",
                        RegexOptions.Compiled | RegexOptions.IgnoreCase);
                }