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

Updated audit info to include full lang name

Browse Source
This commit is contained in:
Shannon
2018-10-30 14:49:25 +11:00
parent bc20db5a46
commit fc39568415
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Umbraco.Core/Services/Implement/ContentService.cs
View File

@@ -849,7 +849,7 @@ namespace Umbraco.Core.Services.Implement
//track the cultures that have changed
var culturesChanging = content.ContentType.VariesByCulture()
? string.Join(",", content.CultureInfos.Where(x => x.Value.IsDirty()).Select(x => x.Key))
? content.CultureInfos.Where(x => x.Value.IsDirty()).Select(x => x.Key).ToList()
: null;
//TODO: Currently there's no way to change track which variant properties have changed, we only have change
// tracking enabled on all values on the Property which doesn't allow us to know which variants have changed.
@@ -867,7 +867,12 @@ namespace Umbraco.Core.Services.Implement
scope.Events.Dispatch(TreeChanged, this, new TreeChange<IContent>(content, changeType).ToEventArgs());
if (culturesChanging != null)
Audit(AuditType.SaveVariant, userId, content.Id, $"Saved cultures: {culturesChanging}", culturesChanging);
{
var langs = string.Join(", ", _languageRepository.GetMany()
.Where(x => culturesChanging.InvariantContains(x.IsoCode))
.Select(x => x.CultureName));
Audit(AuditType.SaveVariant, userId, content.Id, $"Saved languagues: {langs}", langs);
}
else
Audit(AuditType.Save, userId, content.Id);
@@ -1057,7 +1062,7 @@ namespace Umbraco.Core.Services.Implement
var publishing = content.PublishedState == PublishedState.Publishing;
var unpublishing = content.PublishedState == PublishedState.Unpublishing;
string culturesChanging = null;
IEnumerable<string> culturesChanging = null;
using (var scope = ScopeProvider.CreateScope())
{
@@ -1082,7 +1087,7 @@ namespace Umbraco.Core.Services.Implement
}
else
{
culturesChanging = string.Join(",", content.PublishCultureInfos.Where(x => x.Value.IsDirty()).Select(x => x.Key));
culturesChanging = content.PublishCultureInfos.Where(x => x.Value.IsDirty()).Select(x => x.Key).ToList();
}
}
@@ -1193,7 +1198,12 @@ namespace Umbraco.Core.Services.Implement
}
if (culturesChanging != null)
Audit(AuditType.PublishVariant, userId, content.Id, $"Published cultures: {culturesChanging}", culturesChanging);
{
var langs = string.Join(", ", _languageRepository.GetMany()
.Where(x => culturesChanging.InvariantContains(x.IsoCode))
.Select(x => x.CultureName));
Audit(AuditType.PublishVariant, userId, content.Id, $"Published languagues: {langs}", langs);
}
else
Audit(AuditType.Publish, userId, content.Id);

6
src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
View File

@@ -143,14 +143,14 @@
<key alias="delete">Content deleted</key>
<key alias="unpublish">Content unpublished</key>
<key alias="publish">Content saved and Published</key>
<key alias="publishvariant">Content cultures %0% saved and published</key>
<key alias="publishvariant">Content languages: %0% saved and published</key>
<key alias="save">Content saved</key>
<key alias="savevariant">Content cultures %0% saved</key>
<key alias="savevariant">Content languages: %0% saved</key>
<key alias="move">Content moved</key>
<key alias="copy">Content copied</key>
<key alias="rollback">Content rolled back</key>
<key alias="sendtopublish">Content sent for publishing</key>
<key alias="sendtopublishvariant">Content cultures %0% sent for publishing</key>
<key alias="sendtopublishvariant">Content languages: %0% sent for publishing</key>
<key alias="sort">Sort child items performed by user</key>
<key alias="smallCopy">Copy</key>
<key alias="smallPublish">Publish</key>

6
src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
View File

@@ -148,14 +148,14 @@
<key alias="delete">Content deleted</key>
<key alias="unpublish">Content unpublished</key>
<key alias="publish">Content saved and Published</key>
<key alias="publishvariant">Content cultures %0% saved and published</key>
<key alias="publishvariant">Content languages: %0% saved and published</key>
<key alias="save">Content saved</key>
<key alias="savevariant">Content cultures %0% saved</key>
<key alias="savevariant">Content languages: %0% saved</key>
<key alias="move">Content moved</key>
<key alias="copy">Content copied</key>
<key alias="rollback">Content rolled back</key>
<key alias="sendtopublish">Content sent for publishing</key>
<key alias="sendtopublishvariant">Content cultures %0% sent for publishing</key>
<key alias="sendtopublishvariant">Content languages: %0% sent for publishing</key>
<key alias="sort">Sort child items performed by user</key>
<key alias="smallCopy">Copy</key>
<key alias="smallPublish">Publish</key>