From 851cfd69bac9b6a385d5058307a0143ecdce6574 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Wed, 18 Aug 2021 11:17:45 +0800
Subject: [PATCH] Enhancement IQueryStringCultureReplacement.

---
 .../AbpAspNetCoreMvcQueryStringCultureReplacement.cs       | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git 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
index 900d1c5de7..8e173a2e26 100644
--- 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);
                 }