From b98277f573043ceb135185c905f856408dc912fe Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 15 Mar 2016 16:58:13 +0100 Subject: [PATCH] remore ui replacements --- .../LocalizedTextServiceExtensions.cs | 6 +++ .../Trees/ContentTreeController.cs | 42 +++++++++---------- .../Trees/ContentTreeControllerBase.cs | 2 +- .../Trees/DataTypeTreeController.cs | 2 +- .../Trees/LanguageTreeController.cs | 7 ++-- src/Umbraco.Web/Trees/LegacyTreeController.cs | 4 +- .../Trees/LegacyTreeDataConverter.cs | 2 +- src/Umbraco.Web/Trees/MediaTreeController.cs | 18 ++++---- src/Umbraco.Web/Trees/MemberTreeController.cs | 6 +-- .../Trees/MemberTypeTreeController.cs | 7 ++-- .../Trees/TemplatesTreeController.cs | 11 ++--- .../umbraco/controls/ContentPicker.cs | 2 +- .../controls/Tree/JTreeContextMenuItem.cs | 4 +- .../umbraco/controls/Tree/TreeControl.ascx.cs | 3 +- .../umbraco/dialogs/AssignDomain.aspx.cs | 8 ++-- .../umbraco/dialogs/create.aspx.cs | 4 +- .../umbraco/dialogs/cruds.aspx.cs | 2 +- .../umbraco/dialogs/insertMacro.aspx | 8 ++-- .../dialogs/insertMasterpagePlaceholder.aspx | 2 +- ...sertMasterpagePlaceholder.aspx.designer.cs | 2 - .../umbraco/dialogs/moveOrCopy.aspx.cs | 10 ++--- .../umbraco/dialogs/notifications.aspx.cs | 4 +- .../umbraco/dialogs/protectPage.aspx.cs | 4 +- .../umbraco/dialogs/sendToTranslation.aspx.cs | 6 +-- 24 files changed, 88 insertions(+), 78 deletions(-) diff --git a/src/Umbraco.Core/Services/LocalizedTextServiceExtensions.cs b/src/Umbraco.Core/Services/LocalizedTextServiceExtensions.cs index 6d8215492b..c5c297394e 100644 --- a/src/Umbraco.Core/Services/LocalizedTextServiceExtensions.cs +++ b/src/Umbraco.Core/Services/LocalizedTextServiceExtensions.cs @@ -11,6 +11,12 @@ namespace Umbraco.Core.Services /// public static class LocalizedTextServiceExtensions { + public static string Localize(this ILocalizedTextService manager, params string[] keyParts) + { + var key = string.Join("/", keyParts); + return manager.Localize(key, Thread.CurrentThread.CurrentUICulture); + } + /// /// Localize using the current thread culture /// diff --git a/src/Umbraco.Web/Trees/ContentTreeController.cs b/src/Umbraco.Web/Trees/ContentTreeController.cs index 87795be492..6828027db6 100644 --- a/src/Umbraco.Web/Trees/ContentTreeController.cs +++ b/src/Umbraco.Web/Trees/ContentTreeController.cs @@ -136,8 +136,8 @@ namespace Umbraco.Web.Trees .Select(x => new MenuItem(x)); //these two are the standard items - menu.Items.Add(ui.Text("actions", ActionNew.Instance.Alias)); - menu.Items.Add(ui.Text("actions", ActionSort.Instance.Alias), true).ConvertLegacyMenuItem(null, "content", "content"); + menu.Items.Add(Services.TextService.Localize("actions", ActionNew.Instance.Alias)); + menu.Items.Add(Services.TextService.Localize("actions", ActionSort.Instance.Alias), true).ConvertLegacyMenuItem(null, "content", "content"); //filter the standard items FilterUserAllowedMenuItems(menu, nodeActions); @@ -148,8 +148,8 @@ namespace Umbraco.Web.Trees } // add default actions for *all* users - menu.Items.Add(ui.Text("actions", ActionRePublish.Instance.Alias)).ConvertLegacyMenuItem(null, "content", "content"); - menu.Items.Add(ui.Text("actions", ActionRefresh.Instance.Alias), true); + menu.Items.Add(Services.TextService.Localize("actions", ActionRePublish.Instance.Alias)).ConvertLegacyMenuItem(null, "content", "content"); + menu.Items.Add(Services.TextService.Localize("actions", ActionRefresh.Instance.Alias), true); return menu; } @@ -176,7 +176,7 @@ namespace Umbraco.Web.Trees if (item.Path.Split(new[] {','}, StringSplitOptions.RemoveEmptyEntries).Contains(RecycleBinId.ToInvariantString())) { nodeMenu.DefaultMenuAlias = null; - nodeMenu.Items.Insert(2, new MenuItem(ActionRestore.Instance, ui.Text("actions", ActionRestore.Instance.Alias))); + nodeMenu.Items.Insert(2, new MenuItem(ActionRestore.Instance, Services.TextService.Localize("actions", ActionRestore.Instance.Alias))); } else { @@ -217,28 +217,28 @@ namespace Umbraco.Web.Trees protected MenuItemCollection GetAllNodeMenuItems(IUmbracoEntity item) { var menu = new MenuItemCollection(); - menu.Items.Add(ui.Text("actions", ActionNew.Instance.Alias)); - menu.Items.Add(ui.Text("actions", ActionDelete.Instance.Alias)); + menu.Items.Add(Services.TextService.Localize("actions", ActionNew.Instance.Alias)); + menu.Items.Add(Services.TextService.Localize("actions", ActionDelete.Instance.Alias)); //need to ensure some of these are converted to the legacy system - until we upgrade them all to be angularized. - menu.Items.Add(ui.Text("actions", ActionMove.Instance.Alias), true); - menu.Items.Add(ui.Text("actions", ActionCopy.Instance.Alias)); - menu.Items.Add(ui.Text("actions", ActionChangeDocType.Instance.Alias)).ConvertLegacyMenuItem(item, "content", "content"); + menu.Items.Add(Services.TextService.Localize("actions", ActionMove.Instance.Alias), true); + menu.Items.Add(Services.TextService.Localize("actions", ActionCopy.Instance.Alias)); + menu.Items.Add(Services.TextService.Localize("actions", ActionChangeDocType.Instance.Alias)).ConvertLegacyMenuItem(item, "content", "content"); - menu.Items.Add(ui.Text("actions", ActionSort.Instance.Alias), true).ConvertLegacyMenuItem(item, "content", "content"); + menu.Items.Add(Services.TextService.Localize("actions", ActionSort.Instance.Alias), true).ConvertLegacyMenuItem(item, "content", "content"); - menu.Items.Add(ui.Text("actions", ActionRollback.Instance.Alias)).ConvertLegacyMenuItem(item, "content", "content"); - menu.Items.Add(ui.Text("actions", ActionAudit.Instance.Alias)).ConvertLegacyMenuItem(item, "content", "content"); - menu.Items.Add(ui.Text("actions", ActionPublish.Instance.Alias), true).ConvertLegacyMenuItem(item, "content", "content"); - menu.Items.Add(ui.Text("actions", ActionToPublish.Instance.Alias)).ConvertLegacyMenuItem(item, "content", "content"); - menu.Items.Add(ui.Text("actions", ActionAssignDomain.Instance.Alias)).ConvertLegacyMenuItem(item, "content", "content"); - menu.Items.Add(ui.Text("actions", ActionRights.Instance.Alias)).ConvertLegacyMenuItem(item, "content", "content"); - menu.Items.Add(ui.Text("actions", ActionProtect.Instance.Alias), true).ConvertLegacyMenuItem(item, "content", "content"); + menu.Items.Add(Services.TextService.Localize("actions", ActionRollback.Instance.Alias)).ConvertLegacyMenuItem(item, "content", "content"); + menu.Items.Add(Services.TextService.Localize("actions", ActionAudit.Instance.Alias)).ConvertLegacyMenuItem(item, "content", "content"); + menu.Items.Add(Services.TextService.Localize("actions", ActionPublish.Instance.Alias), true).ConvertLegacyMenuItem(item, "content", "content"); + menu.Items.Add(Services.TextService.Localize("actions", ActionToPublish.Instance.Alias)).ConvertLegacyMenuItem(item, "content", "content"); + menu.Items.Add(Services.TextService.Localize("actions", ActionAssignDomain.Instance.Alias)).ConvertLegacyMenuItem(item, "content", "content"); + menu.Items.Add(Services.TextService.Localize("actions", ActionRights.Instance.Alias)).ConvertLegacyMenuItem(item, "content", "content"); + menu.Items.Add(Services.TextService.Localize("actions", ActionProtect.Instance.Alias), true).ConvertLegacyMenuItem(item, "content", "content"); - menu.Items.Add(ui.Text("actions", ActionNotify.Instance.Alias), true).ConvertLegacyMenuItem(item, "content", "content"); - menu.Items.Add(ui.Text("actions", ActionSendToTranslate.Instance.Alias)).ConvertLegacyMenuItem(item, "content", "content"); + menu.Items.Add(Services.TextService.Localize("actions", ActionNotify.Instance.Alias), true).ConvertLegacyMenuItem(item, "content", "content"); + menu.Items.Add(Services.TextService.Localize("actions", ActionSendToTranslate.Instance.Alias)).ConvertLegacyMenuItem(item, "content", "content"); - menu.Items.Add(ui.Text("actions", ActionRefresh.Instance.Alias), true); + menu.Items.Add(Services.TextService.Localize("actions", ActionRefresh.Instance.Alias), true); return menu; } diff --git a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs index af235bda83..b273a162bb 100644 --- a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs +++ b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs @@ -236,7 +236,7 @@ namespace Umbraco.Web.Trees { var menu = new MenuItemCollection(); menu.Items.Add(Services.TextService.Localize("actions/emptyTrashcan")); - menu.Items.Add(ui.Text("actions", ActionRefresh.Instance.Alias), true); + menu.Items.Add(Services.TextService.Localize("actions", ActionRefresh.Instance.Alias), true); return menu; } return PerformGetMenuForNode(id, queryStrings); diff --git a/src/Umbraco.Web/Trees/DataTypeTreeController.cs b/src/Umbraco.Web/Trees/DataTypeTreeController.cs index 29502c76c5..16dec37949 100644 --- a/src/Umbraco.Web/Trees/DataTypeTreeController.cs +++ b/src/Umbraco.Web/Trees/DataTypeTreeController.cs @@ -90,7 +90,7 @@ namespace Umbraco.Web.Trees // root actions menu.Items.Add(Services.TextService.Localize(string.Format("actions/{0}", ActionNew.Instance.Alias))); - menu.Items.Add(ui.Text("actions", ActionRefresh.Instance.Alias), true); + menu.Items.Add(Services.TextService.Localize("actions", ActionRefresh.Instance.Alias), true); return menu; } diff --git a/src/Umbraco.Web/Trees/LanguageTreeController.cs b/src/Umbraco.Web/Trees/LanguageTreeController.cs index 9cbd94ead4..53f71af104 100644 --- a/src/Umbraco.Web/Trees/LanguageTreeController.cs +++ b/src/Umbraco.Web/Trees/LanguageTreeController.cs @@ -5,6 +5,7 @@ using System.Net.Http.Formatting; using System.Web.Services.Description; using umbraco; using Umbraco.Core; +using Umbraco.Core.Services; using Umbraco.Core.Models; using umbraco.presentation.actions; using Umbraco.Web.LegacyActions; @@ -67,13 +68,13 @@ namespace Umbraco.Web.Trees if (id == Constants.System.Root.ToInvariantString()) { //Create the normal create action - menu.Items.Add(ui.Text("actions", ActionNew.Instance.Alias)) + menu.Items.Add(Services.TextService.Localize("actions", ActionNew.Instance.Alias)) //Since we haven't implemented anything for languages in angular, this needs to be converted to //use the legacy format .ConvertLegacyMenuItem(null, "initlanguages", queryStrings.GetValue("application")); //refresh action - menu.Items.Add(ui.Text("actions", ActionRefresh.Instance.Alias), true); + menu.Items.Add(Services.TextService.Localize("actions", ActionRefresh.Instance.Alias), true); return menu; } @@ -82,7 +83,7 @@ namespace Umbraco.Web.Trees if (lang == null) return new MenuItemCollection(); //add delete option for all languages - menu.Items.Add(ui.Text("actions", ActionDelete.Instance.Alias)) + menu.Items.Add(Services.TextService.Localize("actions", ActionDelete.Instance.Alias)) //Since we haven't implemented anything for languages in angular, this needs to be converted to //use the legacy format .ConvertLegacyMenuItem(new UmbracoEntity diff --git a/src/Umbraco.Web/Trees/LegacyTreeController.cs b/src/Umbraco.Web/Trees/LegacyTreeController.cs index cf8d90e0c4..f1bf0489d2 100644 --- a/src/Umbraco.Web/Trees/LegacyTreeController.cs +++ b/src/Umbraco.Web/Trees/LegacyTreeController.cs @@ -92,7 +92,7 @@ namespace Umbraco.Web.Trees foreach (var menuItem in attempt.Result.Items) { - menuItem.Name = global::umbraco.ui.Text("actions", menuItem.Alias); + menuItem.Name = Services.TextService.Localize("actions", menuItem.Alias); } return attempt.Result; } @@ -107,7 +107,7 @@ namespace Umbraco.Web.Trees } foreach (var menuItem in attempt.Result.Items) { - menuItem.Name = global::umbraco.ui.Text("actions", menuItem.Alias); + menuItem.Name = Services.TextService.Localize("actions", menuItem.Alias); } return attempt.Result; } diff --git a/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs b/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs index fa7706c908..1f5359cc03 100644 --- a/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs +++ b/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs @@ -124,7 +124,7 @@ namespace Umbraco.Web.Trees } else { - var menuItem = collection.Items.Add(t, ui.Text("actions", t.Alias)); + var menuItem = collection.Items.Add(t, ApplicationContext.Current.Services.TextService.Localize("actions", t.Alias)); var currentAction = t; diff --git a/src/Umbraco.Web/Trees/MediaTreeController.cs b/src/Umbraco.Web/Trees/MediaTreeController.cs index 3727adb544..4bce894718 100644 --- a/src/Umbraco.Web/Trees/MediaTreeController.cs +++ b/src/Umbraco.Web/Trees/MediaTreeController.cs @@ -38,7 +38,7 @@ namespace Umbraco.Web.Trees { node.MenuUrl = ""; } - node.Name = ui.Text("sections", Constants.Trees.Media); + node.Name = Services.TextService.Localize("sections", Constants.Trees.Media); return node; } @@ -106,9 +106,9 @@ namespace Umbraco.Web.Trees } // root actions - menu.Items.Add(ui.Text("actions", ActionNew.Instance.Alias)); - menu.Items.Add(ui.Text("actions", ActionSort.Instance.Alias), true).ConvertLegacyMenuItem(null, "media", "media"); - menu.Items.Add(ui.Text("actions", ActionRefresh.Instance.Alias), true); + menu.Items.Add(Services.TextService.Localize("actions", ActionNew.Instance.Alias)); + menu.Items.Add(Services.TextService.Localize("actions", ActionSort.Instance.Alias), true).ConvertLegacyMenuItem(null, "media", "media"); + menu.Items.Add(Services.TextService.Localize("actions", ActionRefresh.Instance.Alias), true); return menu; } @@ -123,11 +123,11 @@ namespace Umbraco.Web.Trees throw new HttpResponseException(HttpStatusCode.NotFound); } //return a normal node menu: - menu.Items.Add(ui.Text("actions", ActionNew.Instance.Alias)); - menu.Items.Add(ui.Text("actions", ActionMove.Instance.Alias)); - menu.Items.Add(ui.Text("actions", ActionDelete.Instance.Alias)); - menu.Items.Add(ui.Text("actions", ActionSort.Instance.Alias)).ConvertLegacyMenuItem(item, "media", "media"); - menu.Items.Add(ui.Text("actions", ActionRefresh.Instance.Alias), true); + menu.Items.Add(Services.TextService.Localize("actions", ActionNew.Instance.Alias)); + menu.Items.Add(Services.TextService.Localize("actions", ActionMove.Instance.Alias)); + menu.Items.Add(Services.TextService.Localize("actions", ActionDelete.Instance.Alias)); + menu.Items.Add(Services.TextService.Localize("actions", ActionSort.Instance.Alias)).ConvertLegacyMenuItem(item, "media", "media"); + menu.Items.Add(Services.TextService.Localize("actions", ActionRefresh.Instance.Alias), true); //if the media item is in the recycle bin, don't have a default menu, just show the regular menu if (item.Path.Split(new[] {','}, StringSplitOptions.RemoveEmptyEntries).Contains(RecycleBinId.ToInvariantString())) diff --git a/src/Umbraco.Web/Trees/MemberTreeController.cs b/src/Umbraco.Web/Trees/MemberTreeController.cs index 405721aa97..f3543a3535 100644 --- a/src/Umbraco.Web/Trees/MemberTreeController.cs +++ b/src/Umbraco.Web/Trees/MemberTreeController.cs @@ -151,7 +151,7 @@ namespace Umbraco.Web.Trees menu.DefaultMenuAlias = ActionNew.Instance.Alias; //Create the normal create action - menu.Items.Add(ui.Text("actions", ActionNew.Instance.Alias)); + menu.Items.Add(Services.TextService.Localize("actions", ActionNew.Instance.Alias)); } else { @@ -163,12 +163,12 @@ namespace Umbraco.Web.Trees menu.Items.Add(createMenuItem); } - menu.Items.Add(ui.Text("actions", ActionRefresh.Instance.Alias), true); + menu.Items.Add(Services.TextService.Localize("actions", ActionRefresh.Instance.Alias), true); return menu; } //add delete option for all members - menu.Items.Add(ui.Text("actions", ActionDelete.Instance.Alias)); + menu.Items.Add(Services.TextService.Localize("actions", ActionDelete.Instance.Alias)); return menu; } diff --git a/src/Umbraco.Web/Trees/MemberTypeTreeController.cs b/src/Umbraco.Web/Trees/MemberTypeTreeController.cs index 788b3dfbcb..441dc4e0f9 100644 --- a/src/Umbraco.Web/Trees/MemberTypeTreeController.cs +++ b/src/Umbraco.Web/Trees/MemberTypeTreeController.cs @@ -6,6 +6,7 @@ using System.Text; using System.Threading.Tasks; using umbraco; using Umbraco.Core; +using Umbraco.Core.Services; using Umbraco.Web.LegacyActions; using Umbraco.Web.Models.Trees; using Umbraco.Web.WebApi.Filters; @@ -36,14 +37,14 @@ namespace Umbraco.Web.Trees if (id == Constants.System.Root.ToInvariantString()) { // root actions - menu.Items.Add(ui.Text("actions", ActionNew.Instance.Alias)); - menu.Items.Add(ui.Text("actions", ActionRefresh.Instance.Alias), true); + menu.Items.Add(Services.TextService.Localize("actions", ActionNew.Instance.Alias)); + menu.Items.Add(Services.TextService.Localize("actions", ActionRefresh.Instance.Alias), true); return menu; } else { //delete member type - menu.Items.Add(ui.Text("actions", ActionDelete.Instance.Alias)); + menu.Items.Add(Services.TextService.Localize("actions", ActionDelete.Instance.Alias)); } return menu; diff --git a/src/Umbraco.Web/Trees/TemplatesTreeController.cs b/src/Umbraco.Web/Trees/TemplatesTreeController.cs index dbd5eeab0d..30a149f880 100644 --- a/src/Umbraco.Web/Trees/TemplatesTreeController.cs +++ b/src/Umbraco.Web/Trees/TemplatesTreeController.cs @@ -9,6 +9,7 @@ using System.Web.Services.Description; using umbraco; using umbraco.cms.businesslogic.template; using Umbraco.Core; +using Umbraco.Core.Services; using Umbraco.Core.Configuration; using Umbraco.Core.Models; using Umbraco.Web.LegacyActions; @@ -71,13 +72,13 @@ namespace Umbraco.Web.Trees if (id == Constants.System.Root.ToInvariantString()) { //Create the normal create action - menu.Items.Add(ui.Text("actions", ActionNew.Instance.Alias)) + menu.Items.Add(Services.TextService.Localize("actions", ActionNew.Instance.Alias)) //Since we haven't implemented anything for templates in angular, this needs to be converted to //use the legacy format .ConvertLegacyMenuItem(null, "inittemplates", queryStrings.GetValue("application")); //refresh action - menu.Items.Add(ui.Text("actions", ActionRefresh.Instance.Alias), true); + menu.Items.Add(Services.TextService.Localize("actions", ActionRefresh.Instance.Alias), true); return menu; } @@ -87,7 +88,7 @@ namespace Umbraco.Web.Trees var entity = FromTemplate(template); //Create the create action for creating sub layouts - menu.Items.Add(ui.Text("actions", ActionNew.Instance.Alias)) + menu.Items.Add(Services.TextService.Localize("actions", ActionNew.Instance.Alias)) //Since we haven't implemented anything for templates in angular, this needs to be converted to //use the legacy format .ConvertLegacyMenuItem(entity, "templates", queryStrings.GetValue("application")); @@ -96,14 +97,14 @@ namespace Umbraco.Web.Trees if (template.IsMasterTemplate == false) { //add delete option if it doesn't have children - menu.Items.Add(ui.Text("actions", ActionDelete.Instance.Alias), true) + menu.Items.Add(Services.TextService.Localize("actions", ActionDelete.Instance.Alias), true) //Since we haven't implemented anything for languages in angular, this needs to be converted to //use the legacy format .ConvertLegacyMenuItem(entity, "templates", queryStrings.GetValue("application")); } //add refresh - menu.Items.Add(ui.Text("actions", ActionRefresh.Instance.Alias), true); + menu.Items.Add(Services.TextService.Localize("actions", ActionRefresh.Instance.Alias), true); return menu; diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentPicker.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentPicker.cs index 776b00755f..a8a41d0329 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentPicker.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentPicker.cs @@ -58,7 +58,7 @@ namespace umbraco.controls } else { - tempTitle = (!string.IsNullOrEmpty(TreeAlias) ? ui.Text(TreeAlias) : ui.Text(AppAlias)); + tempTitle = (!string.IsNullOrEmpty(TreeAlias) ? ApplicationContext.Current.Services.TextService.Localize(TreeAlias) : ApplicationContext.Current.Services.TextService.Localize(AppAlias)); } } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/JTreeContextMenuItem.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/JTreeContextMenuItem.cs index 2c7a841891..e8f1045395 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/JTreeContextMenuItem.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/JTreeContextMenuItem.cs @@ -4,6 +4,8 @@ using System.Web.Script.Serialization; using umbraco.interfaces; using umbraco.businesslogic.Utils; using System.Text; +using Umbraco.Core; +using Umbraco.Core.Services; namespace umbraco.controls.Tree { @@ -37,7 +39,7 @@ namespace umbraco.controls.Tree Dictionary data = new Dictionary(); data.Add("id", a.Letter); - data.Add("label", ui.Text(a.Alias)); + data.Add("label", ApplicationContext.Current.Services.TextService.Localize(a.Alias)); if (a.Icon.StartsWith(".")) { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/TreeControl.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/TreeControl.ascx.cs index 252be60056..4fd8eb8892 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/TreeControl.ascx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/TreeControl.ascx.cs @@ -12,6 +12,7 @@ using umbraco.cms.presentation.Trees; using System.Drawing; using System.Linq; using Umbraco.Core; +using Umbraco.Core.Services; namespace umbraco.controls.Tree { @@ -406,7 +407,7 @@ namespace umbraco.controls.Tree //container node labelled with the current application. XmlTree xTree = new XmlTree(); XmlTreeNode xNode = XmlTreeNode.CreateRoot(new NullTree(GetCurrentApp())); - xNode.Text = ui.Text("sections", GetCurrentApp(), Security.CurrentUser); + xNode.Text = Services.TextService.Localize("sections", GetCurrentApp()); xNode.Source = m_TreeService.GetServiceUrl(); xNode.Action = "javascript:" + global::Umbraco.Web.UI.Pages.ClientTools.Scripts.OpenDashboard(GetCurrentApp()); xNode.NodeType = m_TreeService.App.ToLower(); diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain.aspx.cs index b20e7005c6..cca816b12c 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain.aspx.cs @@ -40,7 +40,7 @@ namespace umbraco.dialogs { var d = new Domain(Request.GetItemAs("delDomain")); FeedBackMessage.type = uicontrols.Feedback.feedbacktype.success; - FeedBackMessage.Text = ui.Text("assignDomain", "domainDeleted", d.Name, UmbracoUser); + FeedBackMessage.Text = Services.TextService.Localize("assignDomain/domainDeleted", new[] { d.Name }); d.Delete(); UpdateDomainList(); } @@ -122,7 +122,7 @@ namespace umbraco.dialogs d.Language = new Language(int.Parse(Languages.SelectedValue)); d.Name = DomainName.Text.ToLower(); FeedBackMessage.type = uicontrols.Feedback.feedbacktype.success; - FeedBackMessage.Text = ui.Text("assignDomain", "domainUpdated", DomainName.Text, UmbracoUser); + FeedBackMessage.Text = Services.TextService.Localize("assignDomain/domainUpdated", new[] { DomainName.Text }); d.Save(); DomainName.Text = ""; @@ -141,7 +141,7 @@ namespace umbraco.dialogs if (!Domain.Exists(domainName.ToLower())) { Domain.MakeNew(domainName, _currentId, int.Parse(Languages.SelectedValue)); - FeedBackMessage.Text = ui.Text("assignDomain", "domainCreated", domainName, UmbracoUser); + FeedBackMessage.Text = Services.TextService.Localize("assignDomain/domainCreated", new[] { domainName }); FeedBackMessage.type = uicontrols.Feedback.feedbacktype.success; DomainName.Text = ""; @@ -153,7 +153,7 @@ namespace umbraco.dialogs } else { - FeedBackMessage.Text = ui.Text("assignDomain", "domainExists", DomainName.Text.Trim(), UmbracoUser); + FeedBackMessage.Text = Services.TextService.Localize("assignDomain/domainExists", new[] { DomainName.Text.Trim() }); FeedBackMessage.type = uicontrols.Feedback.feedbacktype.error; } } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/create.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/create.aspx.cs index f4a4820a1e..fd5f5af9c5 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/create.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/create.aspx.cs @@ -44,8 +44,8 @@ namespace umbraco.dialogs // Put user code to initialize the page here if (Request.GetItemAsString("nodeId") == "") { - var appType = ui.Text("sections", App).ToLower(); - pane_chooseNode.Text = ui.Text("create", "chooseNode", appType, UmbracoUser) + "?"; + var appType = Services.TextService.Localize("sections", App).ToLower(); + pane_chooseNode.Text = Services.TextService.Localize("create/chooseNode", new[] { appType }) + "?"; DataBind(); } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/cruds.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/cruds.aspx.cs index 0b2401c20d..e54902712a 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/cruds.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/cruds.aspx.cs @@ -54,7 +54,7 @@ namespace umbraco.dialogs var permissionRow = new HtmlTableRow(); var label = new HtmlTableCell { - InnerText = ui.Text("actions", a.Alias) + InnerText = Services.TextService.Localize("actions", a.Alias) }; permissionRow.Cells.Add(label); _permissions.Add(a.Alias, permissionRow); diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMacro.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMacro.aspx index e34536f1b0..a064413ad2 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMacro.aspx +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMacro.aspx @@ -81,9 +81,9 @@

- " onclick="updateMacro()" /> + " onclick="updateMacro()" />   or   - <%=umbraco.ui.Text("general", "cancel", this.getUser())%> + <%=Services.TextService.Localize("general/cancel")%>

<%} else {%> @@ -93,9 +93,9 @@

- " /> + " />   or   - <%=umbraco.ui.Text("general", "cancel", this.getUser())%> + <%=Services.TextService.Localize("general/cancel")%>

<%}%> diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpagePlaceholder.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpagePlaceholder.aspx index 37636a8dbd..c78e5eb9a4 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpagePlaceholder.aspx +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpagePlaceholder.aspx @@ -28,7 +28,7 @@ - <%=umbraco.ui.Text("general", "cancel", this.getUser())%> + <%=Services.TextService.Localize("general/cancel")%> " /> \ No newline at end of file diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpagePlaceholder.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpagePlaceholder.aspx.designer.cs index 624826f390..e4bbb1ebc0 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpagePlaceholder.aspx.designer.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpagePlaceholder.aspx.designer.cs @@ -20,7 +20,5 @@ namespace umbraco.presentation.umbraco.dialogs { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.TextBox tb_alias; - - protected global::umbraco.uicontrols.PropertyPanel pp_placeholder; } } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/moveOrCopy.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/moveOrCopy.aspx.cs index 7e845074df..43860aeb03 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/moveOrCopy.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/moveOrCopy.aspx.cs @@ -102,12 +102,12 @@ namespace umbraco.dialogs if (Request.GetItemAsString("mode") == "cut") { - pane_form.Text = ui.Text("moveOrCopy", "moveTo", currContent.Name, UmbracoUser); + pane_form.Text = Services.TextService.Localize("moveOrCopy/moveTo", new[] { currContent.Name }); pp_relate.Visible = false; } else { - pane_form.Text = ui.Text("moveOrCopy", "copyTo", currContent.Name, UmbracoUser); + pane_form.Text = Services.TextService.Localize("moveOrCopy/copyTo", new[] { currContent.Name }); pp_relate.Visible = true; } @@ -272,7 +272,7 @@ namespace umbraco.dialogs panel_buttons.Visible = false; var newNodeCaption = parentContent == null - ? ui.Text(CurrentApp) + ? Services.TextService.Localize(CurrentApp) : parentContent.Name; string[] nodes = { currContent.Name, newNodeCaption }; @@ -293,7 +293,7 @@ namespace umbraco.dialogs Services.MediaService.Move(media, copyToId, UmbracoUser.Id); } - feedback.Text = ui.Text("moveOrCopy", "moveDone", nodes, UmbracoUser) + "

" + Services.TextService.Localize("closeThisWindow") + ""; + feedback.Text = Services.TextService.Localize("moveOrCopy/moveDone", nodes) + "

" + Services.TextService.Localize("closeThisWindow") + ""; feedback.type = uicontrols.Feedback.feedbacktype.success; // refresh tree @@ -306,7 +306,7 @@ namespace umbraco.dialogs var newContent = (IContent)currContent; Services.ContentService.Copy(newContent, Request.GetItemAs("copyTo"), RelateDocuments.Checked, UmbracoUser.Id); - feedback.Text = ui.Text("moveOrCopy", "copyDone", nodes, UmbracoUser) + "

" + Services.TextService.Localize("closeThisWindow") + ""; + feedback.Text = Services.TextService.Localize("moveOrCopy/copyDone", nodes) + "

" + Services.TextService.Localize("closeThisWindow") + ""; feedback.type = uicontrols.Feedback.feedbacktype.success; // refresh tree diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx.cs index 83fce8299c..2ed459ecea 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx.cs @@ -30,7 +30,7 @@ namespace umbraco.dialogs protected void Page_Load(object sender, EventArgs e) { Button1.Text = Services.TextService.Localize("update"); - pane_form.Text = ui.Text("notifications", "editNotifications", node.Text, Security.CurrentUser); + pane_form.Text = Services.TextService.Localize("notifications/editNotifications", new[] { node.Text}); } #region Web Form Designer generated code @@ -60,7 +60,7 @@ namespace umbraco.dialogs uicontrols.PropertyPanel pp = new umbraco.uicontrols.PropertyPanel(); pp.CssClass = "inline"; - pp.Text = ui.Text("actions", a.Alias); + pp.Text = Services.TextService.Localize("actions", a.Alias); pp.Controls.Add(c); pane_form.Controls.Add(pp); diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs index 6d3887141f..99ae60ad1d 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs @@ -412,7 +412,7 @@ namespace umbraco.presentation.umbraco.dialogs } } - feedback.Text = ui.Text("publicAccess", "paIsProtected", new cms.businesslogic.CMSNode(pageId).Text) + "

" + Services.TextService.Localize("closeThisWindow") + ""; + feedback.Text = Services.TextService.Localize("publicAccess/paIsProtected", new[] { new cms.businesslogic.CMSNode(pageId).Text}) + "

" + Services.TextService.Localize("closeThisWindow") + ""; p_buttons.Visible = false; pane_advanced.Visible = false; @@ -435,7 +435,7 @@ namespace umbraco.presentation.umbraco.dialogs RemoveProtection(pageId); - feedback.Text = ui.Text("publicAccess", "paIsRemoved", new cms.businesslogic.CMSNode(pageId).Text) + "

" + Services.TextService.Localize("closeThisWindow") + ""; + feedback.Text = Services.TextService.Localize("publicAccess/paIsRemoved", new[] { new cms.businesslogic.CMSNode(pageId).Text}) + "

" + Services.TextService.Localize("closeThisWindow") + ""; var content = Services.ContentService.GetById(pageId); //reloads the current node in the tree diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sendToTranslation.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sendToTranslation.aspx.cs index 390a178801..aa7b71f61e 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sendToTranslation.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sendToTranslation.aspx.cs @@ -33,7 +33,7 @@ namespace umbraco.presentation.dialogs pp_language.Text = Services.TextService.Localize("translation/translateTo"); pp_includeSubs.Text = Services.TextService.Localize("translation/includeSubpages"); pp_comment.Text = Services.TextService.Localize("comment"); - pane_form.Text = ui.Text("translation", "sendToTranslate", _currentPage.Text, Security.CurrentUser); + pane_form.Text = Services.TextService.Localize("translation/sendToTranslate", new[] { _currentPage.Text}); if (!IsPostBack) @@ -104,7 +104,7 @@ namespace umbraco.presentation.dialogs pane_form.Visible = false; pl_buttons.Visible = false; - feedback.Text = ui.Text("translation","pageHasBeenSendToTranslation", _currentPage.Text, Security.CurrentUser) + "

" + Services.TextService.Localize("defaultdialogs/closeThisWindow") + "

"; + feedback.Text = Services.TextService.Localize("translation/pageHasBeenSendToTranslation", new[] { _currentPage.Text}) + "

" + Services.TextService.Localize("defaultdialogs/closeThisWindow") + "

"; feedback.type = Feedback.feedbacktype.success; } @@ -152,7 +152,7 @@ namespace umbraco.presentation.dialogs MailMessage mail = new MailMessage(User.Email, Translator.Email); // populate the message - mail.Subject = ui.Text("translation", "mailSubject", subjectVars, Translator); + mail.Subject = Services.TextService.Localize("translation/mailSubject", Translator.UserEntity.GetUserCulture(Services.TextService), subjectVars); mail.IsBodyHtml = false; mail.Body = ui.Text("translation", "mailBody", bodyVars, Translator); try