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

From int languageId to string culture

Browse Source
This commit is contained in:
Stephan
2018-04-21 09:57:28 +02:00
parent 5d1abaa713
commit a69019aea0
64 changed files with 708 additions and 626 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.cs
View File

@@ -159,7 +159,7 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
pdatas.Add(pdata);
var type = PrimitiveSerializer.Char.ReadFrom(stream);
pdata.LanguageId = (int?) ReadObject(type, stream);
pdata.Culture = (string) ReadObject(type, stream);
type = PrimitiveSerializer.Char.ReadFrom(stream);
pdata.Segment = (string) ReadObject(type, stream);
type = PrimitiveSerializer.Char.ReadFrom(stream);
@@ -211,7 +211,7 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
// write each value
foreach (var pdata in kvp.Value)
{
WriteObject(pdata.LanguageId, stream);
WriteObject(pdata.Culture, stream);
WriteObject(pdata.Segment, stream);
WriteObject(pdata.Value, stream);
}

6
src/Umbraco.Web/PublishedCache/NuCache/DataSource/PropertyData.cs
View File

@@ -4,8 +4,8 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
{
internal class PropertyData
{
[JsonProperty("lang")]
public int? LanguageId { get; set; }
[JsonProperty("culture")]
public string Culture { get; set; }
[JsonProperty("seg")]
public string Segment { get; set; }
@@ -13,4 +13,4 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
[JsonProperty("val")]
public object Value { get; set; }
}
}
}