diff --git a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs index d913d62372..540aa91725 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs +++ b/src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs @@ -444,8 +444,12 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Web.BackOffice.Controllers body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix); ContentItemDisplay display = JsonConvert.DeserializeObject(body); - Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US"); + TestContext.Progress.Write($"======CURRENT THREAD CULTURE IN TEST======{Thread.CurrentThread.CurrentCulture.Name}"); ILocalizedTextService localizedTextService = GetRequiredService(); + foreach (var culture in localizedTextService.GetSupportedCultures()) + { + TestContext.Progress.Write($"======SUPPORTED CULTURES IN TEXT SERVICE======{culture.Name}"); + } var expectedMessage = localizedTextService.Localize("speechBubbles", "publishWithNoDomains", new []{"en-US"}); Assert.Multiple(() => @@ -507,6 +511,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Web.BackOffice.Controllers body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix); ContentItemDisplay display = JsonConvert.DeserializeObject(body); + ILocalizedTextService localizedTextService = GetRequiredService(); var expectedMessage = localizedTextService.Localize("speechBubbles", "publishWithMissingDomain", new []{"en-US"}); diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs index 24a943265e..42b9eb2ddc 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs @@ -261,8 +261,7 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Controllers Mock.Of(), Mock.Of(), Mock.Of(), - Mock.Of(), - Mock.Of() + Mock.Of() ); return controller; diff --git a/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs b/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs index a05aa25238..3f051d0a35 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs @@ -65,7 +65,6 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers private readonly Lazy> _allLangs; private readonly ILogger _logger; private readonly IScopeProvider _scopeProvider; - private readonly IUserDataService _userDataService; public object Domains { get; private set; } @@ -91,8 +90,7 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers ISqlContext sqlContext, IJsonSerializer serializer, IScopeProvider scopeProvider, - IAuthorizationService authorizationService, - IUserDataService userDataService) + IAuthorizationService authorizationService) : base(cultureDictionary, loggerFactory, shortStringHelper, eventMessages, localizedTextService, serializer) { _propertyEditors = propertyEditors; @@ -114,7 +112,6 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers _logger = loggerFactory.CreateLogger(); _scopeProvider = scopeProvider; _allLangs = new Lazy>(() => _localizationService.GetAllLanguages().ToDictionary(x => x.IsoCode, x => x, StringComparer.InvariantCultureIgnoreCase)); - _userDataService = userDataService; } /// @@ -1473,17 +1470,14 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers { assignedDomains.UnionWith(_domainService.GetAssignedDomains(ancestorID, true)); } - foreach (var data in _userDataService.GetUserData()) - { - _logger.LogWarning($"{data.Name} : {data.Data}"); - } + // No domains at all, add a warning, to add domains. if (assignedDomains.Count == 0) { globalNotifications.AddWarningNotification( _localizedTextService.Localize("auditTrails", "publish"), _localizedTextService.Localize("speechBubbles", "publishWithNoDomains")); - _logger.LogWarning("NOT REGISTRED DOMAIN FOR: {Cultures}"); + _logger.LogWarning("The root node {RootNodeName} was published with multiple cultures, but no domains are configured, this will cause routing and caching issues, please register domains for: {Cultures}", persistedContent.Name, string.Join(", ", publishedCultures)); return;