From 2f482bdf536e74bece8b945a456b3380c6a7fba1 Mon Sep 17 00:00:00 2001
From: Stephan <sgay@pilotine.com>
Date: Sat, 12 Jan 2013 10:40:42 -0100
Subject: [PATCH] U4-1017 - more explicit error message on internal cache
 errors

---
 src/Umbraco.Web.UI/umbraco/config/lang/en.xml                  | 1 +
 src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml               | 3 ++-
 .../umbraco.presentation/umbraco/editContent.aspx.cs           | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index d808c6fbfb..6edddefe70 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -103,6 +103,7 @@
     <key alias="nodeName">Page Title</key>
     <key alias="otherElements">Properties</key>
     <key alias="parentNotPublished">This document is published but is not visible because the parent '%0%' is unpublished</key>
+    <key alias="parentNotPublishedAnomaly">Oops: this document is published but is not in the cache (internal error)</key>
     <key alias="publish">Publish</key>
     <key alias="publishStatus">Publication Status</key>
     <key alias="releaseDate">Publish at</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
index 20c66a95f1..a0dec8b6a4 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
@@ -102,6 +102,7 @@
     <key alias="nodeName">Page Title</key>
     <key alias="otherElements">Properties</key>
     <key alias="parentNotPublished">This document is published but is not visible because the parent '%0%' is unpublished</key>
+    <key alias="parentNotPublishedAnomaly">Oops: this document is published but is not in the cache (internal error)</key>
     <key alias="publish">Publish</key>
     <key alias="publishStatus">Publication Status</key>
     <key alias="releaseDate">Publish at</key>
@@ -961,4 +962,4 @@ To manage your website, simply open the umbraco back office and start adding con
     <key alias="userTypes">User types</key>
     <key alias="writer">Writer</key>
   </area>
-</language>
+</language>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs
index 51fcca8299..0fc4268239 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs
@@ -405,7 +405,7 @@ namespace umbraco.cms.presentation
                 while (parent != null && parent.Published);
 
                 if (parent == null) // oops - internal error
-                    niceUrlText = "<i>" + ui.Text("content", "parentNotPublished", "???", base.getUser()) + "</i>";
+                    niceUrlText = "<i>" + ui.Text("content", "parentNotPublishedAnomaly", base.getUser()) + "</i>";
                 else
                     niceUrlText = "<i>" + ui.Text("content", "parentNotPublished", parent.Text, base.getUser()) + "</i>";
             }