Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7
This commit is contained in:
@@ -65,7 +65,7 @@ namespace Umbraco.Web.Editors
|
||||
[HttpGet]
|
||||
public JsonNetResult LocalizedText(string culture = null)
|
||||
{
|
||||
var cultureInfo = culture == null
|
||||
var cultureInfo = string.IsNullOrWhiteSpace(culture)
|
||||
//if the user is logged in, get their culture, otherwise default to 'en'
|
||||
? User.Identity.IsAuthenticated && User.Identity is UmbracoBackOfficeIdentity
|
||||
? Security.CurrentUser.GetUserCulture(Services.TextService)
|
||||
|
||||
Reference in New Issue
Block a user