diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index fea8dd65ec..4ef3e0e0a0 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -404,6 +404,7 @@ ASPXCodeBehind + diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TranslateTreeNames.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TranslateTreeNames.cs new file mode 100644 index 0000000000..ff0a268a44 --- /dev/null +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TranslateTreeNames.cs @@ -0,0 +1,26 @@ +using System.Linq; +using umbraco.cms.businesslogic.language; + +namespace Umbraco.Web.umbraco.presentation.umbraco.Trees +{ + internal class TranslateTreeNames + { + public static string GetTranslatedName(string originalName) + { + + if (originalName.StartsWith("#") == false) + return originalName; + + var lang = Language.GetByCultureCode(System.Threading.Thread.CurrentThread.CurrentCulture.Name); + + if (lang != null && global::umbraco.cms.businesslogic.Dictionary.DictionaryItem.hasKey(originalName.Substring(1, originalName.Length - 1))) + { + var dictionaryItem = new global::umbraco.cms.businesslogic.Dictionary.DictionaryItem(originalName.Substring(1, originalName.Length - 1)); + if (dictionaryItem != null) + return dictionaryItem.Value(lang.id); + } + + return "[" + originalName + "]"; + } + } +} diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMediaTypes.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMediaTypes.cs index 1f58cee995..835c46fdee 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMediaTypes.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMediaTypes.cs @@ -8,6 +8,7 @@ using umbraco.businesslogic; using umbraco.cms.presentation.Trees; using umbraco.interfaces; using Umbraco.Core; +using Umbraco.Web.umbraco.presentation.umbraco.Trees; namespace umbraco { @@ -50,7 +51,7 @@ function openMediaType(id) { XmlTreeNode xNode = XmlTreeNode.Create(this); xNode.NodeID = mediaType.Id.ToString(CultureInfo.InvariantCulture); - xNode.Text = mediaType.Name; + xNode.Text = TranslateTreeNames.GetTranslatedName(mediaType.Name); xNode.Action = string.Format("javascript:openMediaType({0});", mediaType.Id); xNode.Icon = "settingDataType.gif"; xNode.OpenIcon = "settingDataType.gif"; diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadNodeTypes.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadNodeTypes.cs index a5c7dbd7b8..17a7482fcc 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadNodeTypes.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadNodeTypes.cs @@ -3,14 +3,13 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; using System.Text; -using umbraco.cms.businesslogic; -using umbraco.cms.businesslogic.language; using Umbraco.Core.Services; using umbraco.businesslogic; using umbraco.interfaces; using umbraco.BusinessLogic.Actions; using umbraco.cms.presentation.Trees; using Umbraco.Core; +using Umbraco.Web.umbraco.presentation.umbraco.Trees; namespace umbraco @@ -69,7 +68,7 @@ function openNodeType(id) { XmlTreeNode xNode = XmlTreeNode.Create(this); xNode.NodeID = docType.Id.ToString(CultureInfo.InvariantCulture); - xNode.Text = GetTranslatedNodeTypeName(docType.Name); + xNode.Text = TranslateTreeNames.GetTranslatedName(docType.Name); xNode.Action = "javascript:openNodeType(" + docType.Id + ");"; xNode.Icon = "settingDataType.gif"; xNode.OpenIcon = "settingDataType.gif"; @@ -94,23 +93,5 @@ function openNodeType(id) { { get { return Services.ContentTypeService; } } - - private string GetTranslatedNodeTypeName(string originalName) - { - - if (originalName.StartsWith("#") == false) - return originalName; - - var lang = Language.GetByCultureCode(System.Threading.Thread.CurrentThread.CurrentCulture.Name); - - if (lang != null && Dictionary.DictionaryItem.hasKey(originalName.Substring(1, originalName.Length - 1))) - { - var dictionaryItem = new Dictionary.DictionaryItem(originalName.Substring(1, originalName.Length - 1)); - if (dictionaryItem != null) - return dictionaryItem.Value(lang.id); - } - - return "[" + originalName + "]"; - } } }