Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Change language - more user friendly URL address #145
KrzysztofPajak43a0af3db24d
diff --git a/src/Business/Grand.Business.Common/Interfaces/Localization/ILanguageService.cs b/src/Business/Grand.Business.Common/Interfaces/Localization/ILanguageService.csindex aa98ca4b8..9e299fb84 100644--- a/src/Business/Grand.Business.Common/Interfaces/Localization/ILanguageService.cs+++ b/src/Business/Grand.Business.Common/Interfaces/Localization/ILanguageService.cs@@ -25,6 +25,13 @@ namespace Grand.Business.Common.Interfaces.Localization/// <returns>Language</returns>Task<Language> GetLanguageById(string languageId);+ /// <summary>+ /// Gets a language+ /// </summary>+ /// <param name="languageCode">Language code</param>+ /// <returns>Language</returns>+ Task<Language> GetLanguageByCode(string languageCode);+/// <summary>/// Inserts a language/// </summary>diff --git a/src/Business/Grand.Business.Common/Services/Localization/LanguageService.cs b/src/Business/Grand.Business.Common/Services/Localization/LanguageService.csindex 82cfb8cab..99350d55b 100644--- a/src/Business/Grand.Business.Common/Services/Localization/LanguageService.cs+++ b/src/Business/Grand.Business.Common/Services/Localization/LanguageService.cs@@ -88,6 +88,20 @@ namespace Grand.Business.Common.Services.Localizationreturn _cacheBase.GetAsync(key, () => _languageRepository.GetByIdAsync(languageId));}+ /// <summary>+ /// Gets a language+ /// </summary>+ /// <param name="languageCode">Language code</param>+ /// <returns>Language</returns>+ public virtual async Task<Language> GetLanguageByCode(string languageCode)+ {+ if (string.IsNullOrEmpty(languageCode))+ throw new ArgumentNullException(nameof(languageCode));++ var key = string.Format(CacheKey.LANGUAGES_BY_CODE, languageCode);+ return await _cacheBase.GetAsync(key, async () => await _languageRepository.FirstOrDefaultAsync(x=>x.UniqueSeoCode.ToLowerInvariant() == languageCode.ToLowerInvariant()));+ }+/// <summary>/// Inserts a language/// </summary>diff --git a/src/Core/Grand.Infrastructure/Caching/Constants/CommonCacheKey.cs b/src/Core/Grand.Infrastructure/Caching/Constants/CommonCacheKey.csindex 7ffa08fbe..4b969edf2 100644--- a/src/Core/Grand.Infrastructure/Caching/Constants/CommonCacheKey.cs+++ b/src/Core/Grand.Infrastructure/Caching/Constants/CommonCacheKey.cs@@ -59,6 +59,14 @@/// </remarks>public static string LANGUAGES_BY_ID_KEY => "Grand.language.id-{0}";+ /// <summary>+ /// Key for caching+ /// </summary>+ /// <remarks>+ /// {0} : language code+ /// </remarks>+ public static string LANGUAGES_BY_CODE => "Grand.language.code-{0}";+/// <summary>/// Key for caching/// </summary>diff --git a/src/Web/Grand.Web/Controllers/CommonController.cs b/src/Web/Grand.Web/Controllers/CommonController.csindex 9fb80f875..a950bb247 100644--- a/src/Web/Grand.Web/Controllers/CommonController.cs+++ b/src/Web/Grand.Web/Controllers/CommonController.cs@@ -145,10 +145,10 @@ namespace Grand.Web.Controllers[PublicStore(true)]public virtual async Task<IActionResult> SetLanguage([FromServices] AppConfig config,- string langid, string returnUrl = "")+ string langcode, string returnUrl = default){- var language = await _languageService.GetLanguageById(langid);+ var language = await _languageService.GetLanguageByCode(langcode);if (!language?.Published ?? false)language = _workContext.WorkingLanguage;diff --git a/src/Web/Grand.Web/Endpoints/EndpointProvider.cs b/src/Web/Grand.Web/Endpoints/EndpointProvider.csindex b185a2400..a07b31a4f 100644--- a/src/Web/Grand.Web/Endpoints/EndpointProvider.cs+++ b/src/Web/Grand.Web/Endpoints/EndpointProvider.cs@@ -350,9 +350,10 @@ namespace Grand.Web.Endpoints//change languageendpointRouteBuilder.MapControllerRoute("ChangeLanguage",- pattern + "changelanguage/{langid}",+ pattern + "changelanguage/{langcode}",new { controller = "Common", action = "SetLanguage" });+//change taxendpointRouteBuilder.MapControllerRoute("ChangeTaxType",pattern + "changetaxtype/{customertaxtype}",diff --git a/src/Web/Grand.Web/Views/Shared/_Selector_Language.cshtml b/src/Web/Grand.Web/Views/Shared/_Selector_Language.cshtmlindex b5ec23ab0..5fdb8d002 100644--- a/src/Web/Grand.Web/Views/Shared/_Selector_Language.cshtml+++ b/src/Web/Grand.Web/Views/Shared/_Selector_Language.cshtml@@ -19,7 +19,7 @@@foreach (var lang in availableLanguages){var className = lang.Id == workContext.WorkingLanguage.Id ? "active" : "";- <b-dropdown-item class="@className" href="@Url.RouteUrl("ChangeLanguage", new { langid = lang.Id, returnurl })">+ <b-dropdown-item class="@className" href="@Url.RouteUrl("ChangeLanguage", new { langcode = lang.UniqueSeoCode, returnurl })">@lang.Name</b-dropdown-item>}