Browse Source
Merge pull request #9842 from abpframework/auto-merge/rel-4-4/524
Merge branch dev with rel-4.4
pull/9844/head
liangshiwei
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
4 additions and
3 deletions
-
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 = Regex.Replace( |
|
|
context.ReturnUrl, |
|
|
context.ReturnUrl, |
|
|
"culture=[A-Za-z-]+?&", |
|
|
"culture=[A-Za-z-]+", |
|
|
$"culture={context.RequestCulture.Culture}&", |
|
|
$"culture={context.RequestCulture.Culture}", |
|
|
RegexOptions.Compiled | RegexOptions.IgnoreCase); |
|
|
RegexOptions.Compiled | RegexOptions.IgnoreCase); |
|
|
|
|
|
|
|
|
context.ReturnUrl = Regex.Replace( |
|
|
context.ReturnUrl = Regex.Replace( |
|
|
context.ReturnUrl, "ui-culture=[A-Za-z-]+?$", |
|
|
context.ReturnUrl, |
|
|
|
|
|
"ui-culture=[A-Za-z-]+", |
|
|
$"ui-culture={context.RequestCulture.UICulture}", |
|
|
$"ui-culture={context.RequestCulture.UICulture}", |
|
|
RegexOptions.Compiled | RegexOptions.IgnoreCase); |
|
|
RegexOptions.Compiled | RegexOptions.IgnoreCase); |
|
|
} |
|
|
} |
|
|
|
