Merge branch '4.90-bug-fixes' into develop

# Conflicts:
#	src/Presentation/Nop.Web/Areas/Admin/Views/Shared/Table.cshtml

Author: exileDev

src/Presentation/Nop.Web.Framework/UI/INopHtmlHelper.cs

@@ -228,4 +228,12 @@ public partial interface INopHtmlHelper
     /// </summary>
     /// <param name="jsonLd">The JSON-LD serialized model></param>
     void AddJsonLdParts(string jsonLd);
+
+    /// <summary>
+    /// Get the culture name to use on the client side
+    /// </summary>
+    /// <returns>
+    /// The culture name if it exists; otherwise, <see cref="NopCommonDefaults.DefaultLocalePattern"/>
+    /// </returns>
+    string GetDefaultJavaScriptCulture();
 }

src/Presentation/Nop.Web.Framework/UI/NopHtmlHelper.cs

@@ -15,6 +15,8 @@
 using Nop.Core;
 using Nop.Core.Configuration;
 using Nop.Core.Domain.Seo;
+using Nop.Core.Infrastructure;
+using Nop.Services.Common;
 using Nop.Services.Helpers;
 using Nop.Services.Localization;
 using Nop.Web.Framework.Mvc.Routing;
@@ -34,6 +36,7 @@ public partial class NopHtmlHelper : INopHtmlHelper
     protected readonly IHtmlHelper _htmlHelper;
     protected readonly IHttpContextAccessor _httpContextAccessor;
     protected readonly INopAssetHelper _bundleHelper;
+    protected readonly INopFileProvider _fileProvider; 
     protected readonly Lazy<ILocalizationService> _localizationService;
     protected readonly IStoreContext _storeContext;
     protected readonly IWebHelper _webHelper;
@@ -63,6 +66,7 @@ public NopHtmlHelper(AppSettings appSettings,
         IHtmlHelper htmlHelper,
         IHttpContextAccessor httpContextAccessor,
         INopAssetHelper bundleHelper,
+        INopFileProvider fileProvider,
         Lazy<ILocalizationService> localizationService,
         IStoreContext storeContext,
         IWebHelper webHelper,
@@ -74,6 +78,7 @@ public NopHtmlHelper(AppSettings appSettings,
         _htmlHelper = htmlHelper;
         _httpContextAccessor = httpContextAccessor;
         _bundleHelper = bundleHelper;
+        _fileProvider = fileProvider;
         _localizationService = localizationService;
         _storeContext = storeContext;
         _webHelper = webHelper;
@@ -773,6 +778,24 @@ public virtual void AddJsonLdParts(string jsonLd)
             AddHeadCustomParts("<script type=\"application/ld+json\">" + _htmlHelper.Raw(jsonLd) + "</script>");
     }
 
+    /// <summary>
+    /// Get the culture name to use on the client side
+    /// </summary>
+    /// <returns>
+    /// The culture name if it exists; otherwise, <see cref="NopCommonDefaults.DefaultLocalePattern"/>
+    /// </returns>
+    public virtual string GetDefaultJavaScriptCulture()
+    {
+        var cultureToUse = NopCommonDefaults.DefaultLocalePattern;
+
+        if (_fileProvider.DirectoryExists(_fileProvider.Combine(_fileProvider.WebRootPath, string.Format(NopCommonDefaults.LocalePatternPath, CultureInfo.CurrentCulture.Name))))
+            cultureToUse = CultureInfo.CurrentCulture.Name;
+        else if (_fileProvider.DirectoryExists(_fileProvider.Combine(_fileProvider.WebRootPath, string.Format(NopCommonDefaults.LocalePatternPath, CultureInfo.CurrentCulture.TwoLetterISOLanguageName))))
+            cultureToUse = CultureInfo.CurrentCulture.TwoLetterISOLanguageName;
+
+        return cultureToUse;
+    }
+
     #endregion
 
     #region Nested classes

src/Presentation/Nop.Web/Areas/Admin/Views/Shared/Table.cshtml

@@ -1,5 +1,4 @@
 @model DataTablesModel
-
 @functions
 {
     string GetUrl(DataUrl dataUrl)
@@ -277,7 +276,7 @@
                         }).formatToParts(value)
                             .map(({ type, value: vpart }) => //for some locales dotnet accepts latin digits, but still requires localized signs and separators
                             {
-                                var parser = Globalize("@CultureInfo.CurrentUICulture.Name.ToLowerInvariant()").numberParser();
+                                var parser = Globalize("@NopHtml.GetDefaultJavaScriptCulture()").numberParser();
 
                                 if (type == "integer")
                                     return parser(vpart);

src/Presentation/Nop.Web/Areas/Admin/Views/Shared/_AdminScripts.cshtml

@@ -1,30 +1,9 @@
-@inject INopFileProvider fileProvider;
-@inject IWebHelper webHelper
 @inject LocalizationSettings localizationSettings
-@inject Microsoft.AspNetCore.Hosting.IWebHostEnvironment WebHostEnvironment
 @using Nop.Core.Domain.Localization
 @using Nop.Services.Helpers
 
 @{
     var supportRtl = (await workContext.GetWorkingLanguageAsync()).Rtl && !localizationSettings.IgnoreRtlPropertyForAdminArea;
-
-    var culture = CultureInfo.CurrentCulture;
-    var uiCulture = CultureInfo.CurrentUICulture;
-
-    //Code to get check if current cultures scripts are exists. If not, select parent cultures scripts
-    string GetDefaultCulture()
-    {
-        var localePattern = NopCommonDefaults.LocalePatternPath;
-
-        var cultureToUse = NopCommonDefaults.DefaultLocalePattern; //Default regionalisation to use
-
-        if (fileProvider.DirectoryExists(fileProvider.Combine(WebHostEnvironment.WebRootPath, string.Format(localePattern, culture.Name))))
-            cultureToUse = culture.Name;
-        else if (fileProvider.DirectoryExists(fileProvider.Combine(WebHostEnvironment.WebRootPath, string.Format(localePattern, culture.TwoLetterISOLanguageName))))
-            cultureToUse = culture.TwoLetterISOLanguageName;
-
-        return cultureToUse;
-    }
 }
 
 @*Google Font*@
@@ -89,7 +68,7 @@ else
 <script src="~/lib_npm/datatables.net-buttons-bs4/js/buttons.bootstrap4.min.js"></script>
 <script asp-location="Footer">
         var rootAppPath = '@(Url.Content("~/"))';
-        var culture = "@GetDefaultCulture()";
+        var culture = "@NopHtml.GetDefaultJavaScriptCulture()";
 
         //load cldr for current culture
         $.when(