From 9917fb20cafda619d54fc6be067c1a1b07fe7b48 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Fri, 25 Aug 2017 16:13:04 +0200 Subject: [PATCH] U4-10356 Update default Config/Lang after each update Also makes sure UserExtensions returns the correct language --- src/Umbraco.Core/Models/UserExtensions.cs | 5 +++-- src/Umbraco.Web/Editors/BackOfficeController.cs | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Core/Models/UserExtensions.cs b/src/Umbraco.Core/Models/UserExtensions.cs index ece63b4889..a6f388addc 100644 --- a/src/Umbraco.Core/Models/UserExtensions.cs +++ b/src/Umbraco.Core/Models/UserExtensions.cs @@ -1,5 +1,6 @@ using System; using System.Globalization; +using Umbraco.Core.Configuration; using Umbraco.Core.Models.Membership; using Umbraco.Core.Services; @@ -12,7 +13,7 @@ namespace Umbraco.Core.Models /// /// /// - /// + /// public static CultureInfo GetUserCulture(this IUser user, ILocalizedTextService textService) { if (user == null) throw new ArgumentNullException("user"); @@ -34,7 +35,7 @@ namespace Umbraco.Core.Models catch (CultureNotFoundException) { //return the default one - return CultureInfo.GetCultureInfo("en"); + return CultureInfo.GetCultureInfo(GlobalSettings.DefaultUILanguage); } } diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs index f8419fef1e..66e80a76e2 100644 --- a/src/Umbraco.Web/Editors/BackOfficeController.cs +++ b/src/Umbraco.Web/Editors/BackOfficeController.cs @@ -113,7 +113,7 @@ namespace Umbraco.Web.Editors ? Security.IsAuthenticated() //current culture is set at the very beginning of each request ? Thread.CurrentThread.CurrentCulture - : CultureInfo.GetCultureInfo("en") + : CultureInfo.GetCultureInfo(GlobalSettings.DefaultUILanguage) : CultureInfo.GetCultureInfo(culture); var textForCulture = Services.TextService.GetAllStoredValues(cultureInfo)