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

Merge pull request #180 from Jeavon/U4-3432

Browse Source 
Fix for U4-3432Rollback Dialog - CreateDate/Creator formatting tweaks
This commit is contained in:
Sebastiaan Janssen
2013-11-06 09:48:08 -08:00
parent dca0c85db5 e7d587f776
commit 4717faaf1b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -287,7 +287,7 @@
<key alias="alias">Alias</key>
<key alias="areyousure">Are you sure?</key>
<key alias="border">Border</key>
<key alias="by">or</key>
<key alias="by">by</key>
<key alias="cancel">Cancel</key>
<key alias="cellMargin">Cell margin</key>
<key alias="choose">Choose</key>

2
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx.cs
View File

@@ -33,7 +33,7 @@ namespace umbraco.presentation.dialogs
Document rollback = new Document(currentDoc.Id, new Guid(allVersions.SelectedValue));
propertiesCompare.Text = "<tr><th style='width: 25%;' valign='top'>" + ui.Text("general", "name") + ":</th><td>" + rollback.Text + "</td></tr>";
propertiesCompare.Text += "<tr><th style='width: 25%;' valign='top'>" + ui.Text("content", "createDate") + ":</th><td>" + rollback.VersionDate.ToLongDateString() + " " + rollback.VersionDate.ToLongTimeString() + ui.Text("general", "by") + ": " + rollback.User.Name + "</td></tr>";
propertiesCompare.Text += "<tr><th style='width: 25%;' valign='top'>" + ui.Text("content", "createDate") + ":</th><td>" + rollback.VersionDate.ToLongDateString() + " " + rollback.VersionDate.ToLongTimeString() + " " + ui.Text("general", "by") + ": " + rollback.User.Name + "</td></tr>";
if (rbl_mode.SelectedValue == "diff")
lt_notice.Text = ui.Text("rollback", "diffHelp");