yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WIP - gets 'inbound' routing working to generate culture specific URLs

Browse Source
This commit is contained in:
Shannon
2018-04-24 01:31:01 +10:00
parent 7d349ef518
commit 48641166b9
36 changed files with 350 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedContentCache.cs
View File

@@ -112,7 +112,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
return GetByRoute(PreviewDefault, route, hideTopLevelNode);
}
public virtual string GetRouteById(bool preview, int contentId)
public virtual string GetRouteById(bool preview, int contentId, string language = null)
{
// try to get from cache if not previewing
var route = preview || _routesCache == null ? null : _routesCache.GetRoute(contentId);
@@ -137,9 +137,9 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
return route;
}
public string GetRouteById(int contentId)
public string GetRouteById(int contentId, string language = null)
{
return GetRouteById(PreviewDefault, contentId);
return GetRouteById(PreviewDefault, contentId, language);
}
IPublishedContent DetermineIdByRoute(bool preview, string route, bool hideTopLevelNode)

2
src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
View File

@@ -747,6 +747,8 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
public override int SortOrder => _sortOrder;
public override string Name => _name;
public override IReadOnlyDictionary<string, PublishedCultureName> CultureNames => throw new NotSupportedException();
public override string UrlName => _urlName;

4
src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs
View File

@@ -148,7 +148,9 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
if (_nodeInitialized == false) InitializeNode();
return _name;
}
}
}
public override IReadOnlyDictionary<string, PublishedCultureName> CultureNames => throw new NotSupportedException();
public override string DocumentTypeAlias
{