Merge pull request #537 from aspnetboilerplate/change-language-query-string

Include query string in return url for link to change culture

Author: ismcagdas

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Shared/Components/AccountLanguages/Default.cshtml

@@ -1,14 +1,17 @@
-@using System.Text.Encodings.Web
+@using System.Web
 @using AbpCompanyName.AbpProjectName.Web.Views.Shared.Components.AccountLanguages
 @model LanguageSelectionViewModel
 @if (Model.Languages.Count > 1)
 {
     <div class="text-center">
-        @foreach (var language in Model.Languages)
+        @foreach (var languageInfo in Model.Languages)
         {
-            <a href="~/AbpLocalization/ChangeCulture?cultureName=@(language.Name)&returnUrl=@(UrlEncoder.Default.Encode(Context.Request.Path + Context.Request.QueryString))">
-                <span class="@(language.Name == Model.CurrentLanguage.Name ? "current-language-icon" : "")" title="@language.DisplayName">
-                    <i class="@language.Icon"></i>
+            <a href="@Url.Action("ChangeCulture", "AbpLocalization", new {
+                    cultureName = languageInfo.Name,
+                    returnUrl = HttpUtility.UrlEncode(Context.Request.Path + Context.Request.QueryString)
+                })">
+                <span class="@(languageInfo.Name == Model.CurrentLanguage.Name ? "current-language-icon" : "")" title="@languageInfo.DisplayName">
+                    <i class="@languageInfo.Icon"></i>
                 </span>
             </a>
         }

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Shared/Components/RightNavbarLanguageSwitch/Default.cshtml

@@ -1,4 +1,5 @@
-@using AbpCompanyName.AbpProjectName.Web.Views.Shared.Components.RightNavbarLanguageSwitch
+@using System.Web
+@using AbpCompanyName.AbpProjectName.Web.Views.Shared.Components.RightNavbarLanguageSwitch
 @model RightNavbarLanguageSwitchViewModel
 
 <li class="nav-item dropdown">
@@ -7,12 +8,15 @@
         <span class="d-none d-md-inline-block">@Model.CurrentLanguage.DisplayName</span>
     </a>
     <div class="dropdown-menu dropdown-menu-right p-0">
-        @foreach (var language in Model.Languages)
+        @foreach (var languageInfo in Model.Languages)
         {
-            if (language.Name != Model.CurrentLanguage.Name)
+            if (languageInfo.Name != Model.CurrentLanguage.Name)
             {
-                <a class="dropdown-item" href="@(ApplicationPath)AbpLocalization/ChangeCulture?cultureName=@(language.Name)&returnUrl=@(Context.Request.Path)">
-                    <i class="mr-2 @language.Icon"></i> @language.DisplayName
+                <a class="dropdown-item" href="@Url.Action("ChangeCulture", "AbpLocalization", new {
+                                                  cultureName = languageInfo.Name,
+                                                  returnUrl = HttpUtility.UrlEncode(Context.Request.Path + Context.Request.QueryString)
+                                              })">
+                    <i class="mr-2 @languageInfo.Icon"></i> @languageInfo.DisplayName
                 </a>
             }
         }