diff --git a/src/Umbraco.Core/Services/UserDataService.cs b/src/Umbraco.Core/Services/UserDataService.cs index 52c8807019..5af7374a5f 100644 --- a/src/Umbraco.Core/Services/UserDataService.cs +++ b/src/Umbraco.Core/Services/UserDataService.cs @@ -14,9 +14,11 @@ namespace Umbraco.Cms.Core.Services public class UserDataService : IUserDataService { private IUmbracoVersion _version; - public UserDataService(IUmbracoVersion version) + private readonly ILocalizationService _localizationService; + public UserDataService(IUmbracoVersion version, ILocalizationService localizationService) { _version = version; + _localizationService = localizationService; } public IEnumerable GetUserData() @@ -25,6 +27,7 @@ namespace Umbraco.Cms.Core.Services { new UserData("Server OS", RuntimeInformation.OSDescription), new UserData("Server Framework", RuntimeInformation.FrameworkDescription), + new UserData("Default Language", _localizationService.GetDefaultLanguageIsoCode()), new UserData("Umbraco Version", _version.SemanticVersion.ToSemanticStringWithoutBuild()), new UserData("Current Culture", Thread.CurrentThread.CurrentCulture.ToString()), new UserData("Current UI Culture", Thread.CurrentThread.CurrentUICulture.ToString()), diff --git a/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.controller.js index f58d42f22d..ac1b0ac1a1 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.controller.js @@ -42,7 +42,7 @@ if(browserInfo != null){ vm.systemInfo.push({name :"Browser", data: browserInfo.name + " " + browserInfo.version}); } - vm.systemInfo.push({name :"User OS", data: getPlatform()}); + vm.systemInfo.push({name :"Browser OS", data: getPlatform()}); }); tourService.getGroupedTours().then(function(groupedTours) { vm.tours = groupedTours; @@ -225,29 +225,6 @@ const allPlatforms = ['Win32', 'Win64', 'Windows', 'WinCE', 'Android', 'iPhone', 'iPad', 'iPod']; return allPlatforms.find(item => item === window.navigator.platform); } - function getCurrentBrowser(){ - let sBrowser, sUsrAg = window.navigator.userAgent; - if (sUsrAg.indexOf("Firefox") > -1) { - sBrowser = "Mozilla Firefox"; - } else if (sUsrAg.indexOf("SamsungBrowser") > -1) { - sBrowser = "Samsung Internet"; - } else if (sUsrAg.indexOf("Opera") > -1 || sUsrAg.indexOf("OPR") > -1) { - sBrowser = "Opera"; - } else if (sUsrAg.indexOf("Trident") > -1) { - sBrowser = "Microsoft Internet Explorer"; - } else if (sUsrAg.indexOf("Edge") > -1) { - sBrowser = "Microsoft Edge (Legacy)"; - } else if (sUsrAg.indexOf("Edg") > -1) { - sBrowser = "Microsoft Edge (Chromium)"; - } else if (sUsrAg.indexOf("Chrome") > -1) { - sBrowser = "Google Chrome or Chromium"; - } else if (sUsrAg.indexOf("Safari") > -1) { - sBrowser = "Apple Safari"; - } else { - sBrowser = "unknown"; - } - return sBrowser; - } evts.push(eventsService.on("appState.tour.complete", function (event, tour) { tourService.getGroupedTours().then(function(groupedTours) { vm.tours = groupedTours;