diff --git a/src/Umbraco.Web/Models/ContentExtensions.cs b/src/Umbraco.Web/Models/ContentExtensions.cs
index dc12a90250..4a535bb0e6 100644
--- a/src/Umbraco.Web/Models/ContentExtensions.cs
+++ b/src/Umbraco.Web/Models/ContentExtensions.cs
@@ -20,7 +20,7 @@ namespace Umbraco.Web.Models
public static CultureInfo GetCulture(this IContent content, Uri current = null)
{
return GetCulture(UmbracoContext.Current,
- ApplicationContext.Current.Services.DomainService, ApplicationContext.Current.Services.LocalizationService,
+ ApplicationContext.Current.Services.LocalizationService,
content.Id, content.Path,
current);
}
@@ -30,23 +30,20 @@ namespace Umbraco.Web.Models
/// within the context of a specified current request.
///
/// An instance.
- /// An implementation.
/// An implementation.
/// The content identifier.
/// The content path.
/// The request Uri.
/// The culture that would be selected to render the content.
- public static CultureInfo GetCulture(UmbracoContext umbracoContext, IDomainService domainService, ILocalizationService localizationService,
+ public static CultureInfo GetCulture(UmbracoContext umbracoContext, ILocalizationService localizationService,
int contentId, string contentPath, Uri current)
{
var route = umbracoContext.ContentCache.GetRouteById(contentId); // cached
var pos = route.IndexOf('/');
- var domainHelper = new DomainHelper(domainService);
-
var domain = pos == 0
? null
- : domainHelper.DomainForNode(int.Parse(route.Substring(0, pos)), current).UmbracoDomain;
+ : DomainHelper.DomainForNode(int.Parse(route.Substring(0, pos)), current).Domain;
if (domain == null)
{
@@ -54,10 +51,10 @@ namespace Umbraco.Web.Models
return defaultLanguage == null ? CultureInfo.CurrentUICulture : new CultureInfo(defaultLanguage.IsoCode);
}
- var wcDomain = DomainHelper.FindWildcardDomainInPath(domainService.GetAll(true), contentPath, domain.RootContent.Id);
+ var wcDomain = DomainHelper.FindWildcardDomainInPath(DomainHelper.GetAllDomains(true), contentPath, domain.RootNodeId);
return wcDomain == null
- ? new CultureInfo(domain.Language.IsoCode)
- : new CultureInfo(wcDomain.Language.IsoCode);
+ ? new CultureInfo(domain.Language.CultureAlias)
+ : new CultureInfo(wcDomain.Language.CultureAlias);
}
}
}
diff --git a/src/Umbraco.Web/PublishedContentExtensions.cs b/src/Umbraco.Web/PublishedContentExtensions.cs
index 7302913d34..5e750e3f2b 100644
--- a/src/Umbraco.Web/PublishedContentExtensions.cs
+++ b/src/Umbraco.Web/PublishedContentExtensions.cs
@@ -1898,7 +1898,7 @@ namespace Umbraco.Web
public static CultureInfo GetCulture(this IPublishedContent content, Uri current = null)
{
return Models.ContentExtensions.GetCulture(UmbracoContext.Current,
- ApplicationContext.Current.Services.DomainService, ApplicationContext.Current.Services.LocalizationService,
+ ApplicationContext.Current.Services.LocalizationService,
content.Id, content.Path,
current);
}