diff --git a/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs b/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs index daacab4a93..ed354d2ad1 100644 --- a/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs +++ b/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs @@ -7,6 +7,7 @@ using AutoMapper; using Moq; using NUnit.Framework; using Umbraco.Core; +using Umbraco.Core.Services; using Umbraco.Core.Dictionary; using Umbraco.Core.Logging; using Umbraco.Core.Models; @@ -127,7 +128,7 @@ namespace Umbraco.Tests.Models.Mapping AssertDisplayProperty(result, p, ApplicationContext); } Assert.AreEqual(content.PropertyGroups.Count(), result.Tabs.Count() - 1); - Assert.IsTrue(result.Tabs.Any(x => x.Label == ui.Text("general", "properties"))); + Assert.IsTrue(result.Tabs.Any(x => x.Label == ApplicationContext.Services.TextService.Localize("general/properties"))); Assert.IsTrue(result.Tabs.First().IsActive); Assert.IsTrue(result.Tabs.Except(new[] {result.Tabs.First()}).All(x => x.IsActive == false)); } @@ -173,8 +174,8 @@ namespace Umbraco.Tests.Models.Mapping AssertDisplayProperty(result, p, ApplicationContext); } Assert.AreEqual(content.PropertyGroups.Count(), result.Tabs.Count() - 1); - Assert.IsTrue(result.Tabs.Any(x => x.Label == ui.Text("general", "properties"))); - Assert.AreEqual(2, result.Tabs.Where(x => x.Label == ui.Text("general", "properties")).SelectMany(x => x.Properties.Where(p => p.Alias.StartsWith("_umb_") == false)).Count()); + Assert.IsTrue(result.Tabs.Any(x => x.Label == ApplicationContext.Services.TextService.Localize("general/properties"))); + Assert.AreEqual(2, result.Tabs.Where(x => x.Label == ApplicationContext.Services.TextService.Localize("general/properties")).SelectMany(x => x.Properties.Where(p => p.Alias.StartsWith("_umb_") == false)).Count()); } #region Assertions diff --git a/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs b/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs index d175d4352e..bfe7974cd6 100644 --- a/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs +++ b/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs @@ -191,7 +191,7 @@ namespace Umbraco.Web.UI.Umbraco.Settings.Views ClientTools.Scripts.OpenModalWindow( IOHelper.ResolveUrl(SystemDirectories.Umbraco) + "/dialogs/umbracoField.aspx?objectId=" + editorSource.ClientID + "&tagName=UMBRACOGETDATA&mvcView=true", Services.TextService.Localize("template/insertPageField"), 640, 550); - umbField.AltText = ui.Text("template", "insertPageField"); + umbField.AltText = Services.TextService.Localize("template/insertPageField"); // TODO: Update icon @@ -256,21 +256,21 @@ namespace Umbraco.Web.UI.Umbraco.Settings.Views MenuIconI umbRenderBody = editorSource.Menu.NewIcon(); umbRenderBody.ImageURL = SystemDirectories.Umbraco + "/images/editor/renderbody.gif"; - //umbContainer.AltText = ui.Text("template", "insertContentAreaPlaceHolder"); + //umbContainer.AltText = Services.TextService.Localize("template/insertContentAreaPlaceHolder"); umbRenderBody.AltText = "Insert @RenderBody()"; umbRenderBody.OnClickCommand = "editViewEditor.insertRenderBody()"; MenuIconI umbSection = editorSource.Menu.NewIcon(); umbSection.ImageURL = SystemDirectories.Umbraco + "/images/editor/masterpagePlaceHolder.gif"; - //umbContainer.AltText = ui.Text("template", "insertContentAreaPlaceHolder"); + //umbContainer.AltText = Services.TextService.Localize("template/insertContentAreaPlaceHolder"); umbSection.AltText = "Insert Section"; umbSection.OnClickCommand = "editViewEditor.openSnippetModal('section')"; MenuIconI umbRenderSection = editorSource.Menu.NewIcon(); umbRenderSection.ImageURL = SystemDirectories.Umbraco + "/images/editor/masterpageContent.gif"; - //umbContainer.AltText = ui.Text("template", "insertContentAreaPlaceHolder"); + //umbContainer.AltText = Services.TextService.Localize("template/insertContentAreaPlaceHolder"); umbRenderSection.AltText = "Insert @RenderSection"; umbRenderSection.OnClickCommand = "editViewEditor.openSnippetModal('rendersection')"; diff --git a/src/Umbraco.Web/Editors/CurrentUserController.cs b/src/Umbraco.Web/Editors/CurrentUserController.cs index 5c56106063..38a649e811 100644 --- a/src/Umbraco.Web/Editors/CurrentUserController.cs +++ b/src/Umbraco.Web/Editors/CurrentUserController.cs @@ -1,23 +1,12 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Net; -using System.Text; -using System.Threading.Tasks; using System.Web.Http; -using System.Web.Security; -using AutoMapper; -using Umbraco.Core.Configuration; +using Umbraco.Core.Services; using Umbraco.Web.Models; using Umbraco.Web.Models.ContentEditing; -using Umbraco.Web.Models.Mapping; using Umbraco.Web.Mvc; -using Umbraco.Web.UI; using Umbraco.Web.WebApi; -using umbraco; using legacyUser = umbraco.BusinessLogic.User; -using System.Net.Http; -using System.Collections.Specialized; using Constants = Umbraco.Core.Constants; @@ -62,7 +51,7 @@ namespace Umbraco.Web.Editors { //even if we weren't resetting this, it is the correct value (null), otherwise if we were resetting then it will contain the new pword var result = new ModelWithNotifications(passwordChangeResult.Result.ResetPassword); - result.AddSuccessNotification(ui.Text("user", "password"), ui.Text("user", "passwordChanged")); + result.AddSuccessNotification(Services.TextService.Localize("user/password"), Services.TextService.Localize("user/passwordChanged")); return result; } diff --git a/src/Umbraco.Web/Editors/DataTypeController.cs b/src/Umbraco.Web/Editors/DataTypeController.cs index 931d00968b..9df63d1e10 100644 --- a/src/Umbraco.Web/Editors/DataTypeController.cs +++ b/src/Umbraco.Web/Editors/DataTypeController.cs @@ -223,7 +223,7 @@ namespace Umbraco.Web.Editors } var display = Mapper.Map(dataType.PersistedDataType); - display.AddSuccessNotification(ui.Text("speechBubbles", "dataTypeSaved"), ""); + display.AddSuccessNotification(Services.TextService.Localize("speechBubbles/dataTypeSaved"), ""); //now return the updated model return display; @@ -242,28 +242,28 @@ namespace Umbraco.Web.Editors return Request.CreateResponse(HttpStatusCode.NotFound); } - var result = Services.DataTypeService.Move(toMove, move.ParentId); - if (result.Success) - { - var response = Request.CreateResponse(HttpStatusCode.OK); - response.Content = new StringContent(toMove.Path, Encoding.UTF8, "application/json"); - return response; - } - - switch (result.Result.StatusType) - { - case MoveOperationStatusType.FailedParentNotFound: - return Request.CreateResponse(HttpStatusCode.NotFound); + var result = Services.DataTypeService.Move(toMove, move.ParentId); + if (result.Success) + { + var response = Request.CreateResponse(HttpStatusCode.OK); + response.Content = new StringContent(toMove.Path, Encoding.UTF8, "application/json"); + return response; + } + + switch (result.Result.StatusType) + { + case MoveOperationStatusType.FailedParentNotFound: + return Request.CreateResponse(HttpStatusCode.NotFound); case MoveOperationStatusType.FailedCancelledByEvent: //returning an object of INotificationModel will ensure that any pending // notification messages are added to the response. - return Request.CreateValidationErrorResponse(new SimpleNotificationModel()); - case MoveOperationStatusType.FailedNotAllowedByPath: + return Request.CreateValidationErrorResponse(new SimpleNotificationModel()); + case MoveOperationStatusType.FailedNotAllowedByPath: var notificationModel = new SimpleNotificationModel(); - notificationModel.AddErrorNotification(Services.TextService.Localize("moveOrCopy/notAllowedByPath"), ""); + notificationModel.AddErrorNotification(Services.TextService.Localize("moveOrCopy/notAllowedByPath"), ""); return Request.CreateValidationErrorResponse(notificationModel); - default: - throw new ArgumentOutOfRangeException(); + default: + throw new ArgumentOutOfRangeException(); } } diff --git a/src/Umbraco.Web/PropertyEditors/UploadFileTypeValidator.cs b/src/Umbraco.Web/PropertyEditors/UploadFileTypeValidator.cs index 96a1211589..42ad7d96c4 100644 --- a/src/Umbraco.Web/PropertyEditors/UploadFileTypeValidator.cs +++ b/src/Umbraco.Web/PropertyEditors/UploadFileTypeValidator.cs @@ -5,6 +5,7 @@ using System.IO; using System.Linq; using Newtonsoft.Json.Linq; using Umbraco.Core; +using Umbraco.Core.Services; using Umbraco.Core.Configuration; using Umbraco.Core.Models; using Umbraco.Core.PropertyEditors; @@ -26,7 +27,7 @@ namespace Umbraco.Web.PropertyEditors { if (ValidateFileExtension(fileName) == false) { - yield return new ValidationResult(ui.Text("errors", "dissallowedMediaType"), + yield return new ValidationResult(ApplicationContext.Current.Services.TextService.Localize("errors/dissallowedMediaType"), new[] { //we only store a single value for this editor so the 'member' or 'field' diff --git a/src/Umbraco.Web/PropertyEditors/ValueListPreValueEditor.cs b/src/Umbraco.Web/PropertyEditors/ValueListPreValueEditor.cs index 42484282e9..41c45efb98 100644 --- a/src/Umbraco.Web/PropertyEditors/ValueListPreValueEditor.cs +++ b/src/Umbraco.Web/PropertyEditors/ValueListPreValueEditor.cs @@ -6,6 +6,7 @@ using System.Text.RegularExpressions; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Umbraco.Core; +using Umbraco.Core.Services; using Umbraco.Core.Logging; using Umbraco.Core.Models; using Umbraco.Core.PropertyEditors; @@ -45,7 +46,7 @@ namespace Umbraco.Web.PropertyEditors //It's also important to note that by default the dropdown angular controller is expecting the // config options to come in with a property called 'items' Key = "items", - Name = ui.Text("editdatatype", "addPrevalue"), + Name = ApplicationContext.Current.Services.TextService.Localize("editdatatype/addPrevalue"), View = "multivalues" } }; diff --git a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs index 1481e04fe5..2b197f08f6 100644 --- a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs +++ b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs @@ -6,6 +6,7 @@ using System.Net.Http; using System.Net.Http.Formatting; using System.Web.Http; using Umbraco.Core; +using Umbraco.Core.Services; using Umbraco.Core.Logging; using Umbraco.Core.Models; using Umbraco.Core.Models.EntityBase; @@ -234,7 +235,7 @@ namespace Umbraco.Web.Trees if (RecycleBinId.ToInvariantString() == id) { var menu = new MenuItemCollection(); - menu.Items.Add(ui.Text("actions", "emptyTrashcan")); + menu.Items.Add(Services.TextService.Localize("actions/emptyTrashcan")); menu.Items.Add(ui.Text("actions", ActionRefresh.Instance.Alias), true); return menu; } diff --git a/src/Umbraco.Web/Trees/MemberTreeController.cs b/src/Umbraco.Web/Trees/MemberTreeController.cs index 975a66195e..405721aa97 100644 --- a/src/Umbraco.Web/Trees/MemberTreeController.cs +++ b/src/Umbraco.Web/Trees/MemberTreeController.cs @@ -1,5 +1,4 @@ using System; -using System.Globalization; using System.Linq; using System.Net; using System.Net.Http; @@ -7,9 +6,7 @@ using System.Net.Http.Formatting; using System.Web.Http; using System.Web.Security; using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Models.EntityBase; -using Umbraco.Core.Persistence.Querying; +using Umbraco.Core.Services; using Umbraco.Core.Security; using Umbraco.Web.Models.Trees; using Umbraco.Web.Mvc; @@ -121,7 +118,7 @@ namespace Umbraco.Web.Trees if (id == Constants.System.Root.ToInvariantString()) { nodes.Add( - CreateTreeNode(Constants.Conventions.MemberTypes.AllMembersListId, id, queryStrings, ui.Text("member", "allMembers"), "icon-users", false, + CreateTreeNode(Constants.Conventions.MemberTypes.AllMembersListId, id, queryStrings, Services.TextService.Localize("member/allMembers"), "icon-users", false, queryStrings.GetValue("application") + TreeAlias.EnsureStartsWith('/') + "/list/" + Constants.Conventions.MemberTypes.AllMembersListId)); if (_isUmbracoProvider) diff --git a/src/Umbraco.Web/WebServices/SaveFileController.cs b/src/Umbraco.Web/WebServices/SaveFileController.cs index ab14f80a53..59220fbc4c 100644 --- a/src/Umbraco.Web/WebServices/SaveFileController.cs +++ b/src/Umbraco.Web/WebServices/SaveFileController.cs @@ -116,24 +116,24 @@ namespace Umbraco.Web.WebServices { var partialView = currentView as PartialView; if (partialView != null && validate != null && validate(svce, partialView) == false) - return Failed(ui.Text("speechBubbles", "partialViewErrorText"), ui.Text("speechBubbles", "partialViewErrorHeader"), + return Failed(Services.TextService.Localize("speechBubbles/partialViewErrorText"), Services.TextService.Localize("speechBubbles/partialViewErrorHeader"), new FileSecurityException("File '" + currentView.Path + "' is not a valid partial view file.")); attempt = save(svce, currentView); } catch (Exception e) { - return Failed(ui.Text("speechBubbles", "partialViewErrorText"), ui.Text("speechBubbles", "partialViewErrorHeader"), e); + return Failed(Services.TextService.Localize("speechBubbles/partialViewErrorText"), Services.TextService.Localize("speechBubbles/partialViewErrorHeader"), e); } if (attempt.Success == false) { - return Failed(ui.Text("speechBubbles", "partialViewErrorText"), ui.Text("speechBubbles", "partialViewErrorHeader"), + return Failed(Services.TextService.Localize("speechBubbles/partialViewErrorText"), Services.TextService.Localize("speechBubbles/partialViewErrorHeader"), attempt.Exception); } - return Success(ui.Text("speechBubbles", "partialViewSavedText"), ui.Text("speechBubbles", "partialViewSavedHeader"), new { name = currentView.Name, path = currentView.Path }); + return Success(Services.TextService.Localize("speechBubbles/partialViewSavedText"), Services.TextService.Localize("speechBubbles/partialViewSavedHeader"), new { name = currentView.Name, path = currentView.Path }); } /// @@ -172,7 +172,7 @@ namespace Umbraco.Web.WebServices catch (ArgumentException ex) { //the template does not exist - return Failed("Template does not exist", ui.Text("speechBubbles", "templateErrorHeader"), ex); + return Failed("Template does not exist", Services.TextService.Localize("speechBubbles/templateErrorHeader"), ex); } try @@ -188,7 +188,7 @@ namespace Umbraco.Web.WebServices } var syncPath = "-1,init," + t.Path.Replace("-1,", ""); - return Success(ui.Text("speechBubbles", "templateSavedText"), ui.Text("speechBubbles", "templateSavedHeader"), + return Success(Services.TextService.Localize("speechBubbles/templateSavedText"), Services.TextService.Localize("speechBubbles/templateSavedHeader"), new { path = syncPath, @@ -197,7 +197,7 @@ namespace Umbraco.Web.WebServices } catch (Exception ex) { - return Failed(ui.Text("speechBubbles", "templateErrorText"), ui.Text("speechBubbles", "templateErrorHeader"), ex); + return Failed(Services.TextService.Localize("speechBubbles/templateErrorText"), Services.TextService.Localize("speechBubbles/templateErrorHeader"), ex); } } @@ -220,17 +220,17 @@ namespace Umbraco.Web.WebServices try { if (svce.ValidateScript(script) == false) - return Failed(ui.Text("speechBubbles", "scriptErrorText"), ui.Text("speechBubbles", "scriptErrorHeader"), + return Failed(Services.TextService.Localize("speechBubbles/scriptErrorText"), Services.TextService.Localize("speechBubbles/scriptErrorHeader"), new FileSecurityException("File '" + filename + "' is not a valid script file.")); svce.SaveScript(script); } catch (Exception e) { - return Failed(ui.Text("speechBubbles", "scriptErrorText"), ui.Text("speechBubbles", "scriptErrorHeader"), e); + return Failed(Services.TextService.Localize("speechBubbles/scriptErrorText"), Services.TextService.Localize("speechBubbles/scriptErrorHeader"), e); } - return Success(ui.Text("speechBubbles", "scriptSavedText"), ui.Text("speechBubbles", "scriptSavedHeader"), + return Success(Services.TextService.Localize("speechBubbles/scriptSavedText"), Services.TextService.Localize("speechBubbles/scriptSavedHeader"), new { path = BaseTree.GetTreePathFromFilePath(script.Path), @@ -260,17 +260,17 @@ namespace Umbraco.Web.WebServices try { if (svce.ValidateStylesheet(stylesheet) == false) - return Failed(ui.Text("speechBubbles", "cssErrorText"), ui.Text("speechBubbles", "cssErrorHeader"), + return Failed(Services.TextService.Localize("speechBubbles/cssErrorText"), Services.TextService.Localize("speechBubbles/cssErrorHeader"), new FileSecurityException("File '" + filename + "' is not a valid stylesheet file.")); svce.SaveStylesheet(stylesheet); } catch (Exception e) { - return Failed(ui.Text("speechBubbles", "cssErrorText"), ui.Text("speechBubbles", "cssErrorHeader"), e); + return Failed(Services.TextService.Localize("speechBubbles/cssErrorText"), Services.TextService.Localize("speechBubbles/cssErrorHeader"), e); } - return Success(ui.Text("speechBubbles", "cssSavedText"), ui.Text("speechBubbles", "cssSavedHeader"), + return Success(Services.TextService.Localize("speechBubbles/cssSavedText"), Services.TextService.Localize("speechBubbles/cssSavedHeader"), new { path = BaseTree.GetTreePathFromFilePath(stylesheet.Path), diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/UserPermissions.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/UserPermissions.cs index babaa58a39..a6d94a07cd 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/UserPermissions.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/UserPermissions.cs @@ -1,15 +1,6 @@ -using System; -using System.Data; -using System.Configuration; -using System.Web; -using System.Web.Security; -using System.Web.UI; -using System.Web.UI.HtmlControls; -using System.Web.UI.WebControls; -using System.Web.UI.WebControls.WebParts; -using umbraco.businesslogic; +using Umbraco.Core.Services; +using System; using umbraco.interfaces; -using System.Xml; using System.Collections.Generic; using System.Text; using Umbraco.Core; @@ -68,7 +59,7 @@ namespace umbraco.cms.presentation.Trees protected override void CreateRootNode(ref XmlTreeNode rootNode) { - rootNode.Text = ui.Text("user", "userPermissions"); + rootNode.Text = Services.TextService.Localize("user/userPermissions"); } public override void RenderJS(ref StringBuilder Javascript) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/UserTypes.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/UserTypes.cs index 3e722d0a7a..128ee3ab2a 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/UserTypes.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/UserTypes.cs @@ -1,15 +1,7 @@ +using Umbraco.Core.Services; using System; -using System.Data; -using System.Configuration; -using System.Web; -using System.Web.Security; -using System.Web.UI; -using System.Web.UI.WebControls; -using System.Web.UI.WebControls.WebParts; -using System.Web.UI.HtmlControls; using umbraco.BusinessLogic; using System.Collections.Generic; -using umbraco.businesslogic; using Umbraco.Core; using Umbraco.Web.Trees; @@ -56,7 +48,7 @@ function openUserTypes(id) { protected override void CreateRootNode(ref XmlTreeNode rootNode) { - rootNode.Text = ui.Text("user", "userTypes"); + rootNode.Text = Services.TextService.Localize("user/userTypes"); } } } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs index deb5e439d4..91fb286f7c 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs @@ -4,6 +4,7 @@ using System.Text; using umbraco.businesslogic; using umbraco.interfaces; using Umbraco.Core; +using Umbraco.Core.Services; using umbraco.cms.presentation.Trees; using Umbraco.Web.LegacyActions; using Umbraco.Web.Trees; @@ -97,7 +98,7 @@ namespace umbraco { xNode.Source = "tree.aspx?app=" + this._app + "&id=" + this._id + "&treeType=packagerPackages&packageType=installed" + "&rnd=" + Guid.NewGuid(); xNode.NodeType = "installedPackages"; - xNode.Text = ui.Text("treeHeaders", "installedPackages"); + xNode.Text = Services.TextService.Localize("treeHeaders/installedPackages"); xNode.HasChildren = true; } else @@ -123,7 +124,7 @@ namespace umbraco { xNode.Source = "tree.aspx?app=" + this._app + "&id=" + this._id + "&treeType=packagerPackages&packageType=repositories" + "&rnd=" + Guid.NewGuid(); xNode.NodeType = "packagesRepositories"; - xNode.Text = ui.Text("treeHeaders", "repositories"); + xNode.Text = Services.TextService.Localize("treeHeaders/repositories"); xNode.HasChildren = true; } */ @@ -147,7 +148,7 @@ namespace umbraco xNode.Menu.Clear(); xNode.Menu.Add(ActionNew.Instance); xNode.Menu.Add(ActionRefresh.Instance); - xNode.Text = ui.Text("treeHeaders", "createdPackages"); + xNode.Text = Services.TextService.Localize("treeHeaders/createdPackages"); xNode.HasChildren = true; xNode.Action = "javascript:void(0);"; @@ -158,7 +159,7 @@ namespace umbraco xNode.NodeType = "uploadPackage"; xNode.Icon = "icon-page-up"; xNode.Action = "javascript:openPackageCategory('" + items[i, 0] + "');"; - xNode.Text = ui.Text("treeHeaders", "localPackage"); + xNode.Text = Services.TextService.Localize("treeHeaders/localPackage"); xNode.Menu.Clear(); break; @@ -167,7 +168,7 @@ namespace umbraco xNode.NodeType = "starterKits"; xNode.Action = "javascript:openPackageCategory('" + items[i, 0] + "');"; xNode.Icon = "icon-flash"; - xNode.Text = ui.Text("treeHeaders", "installStarterKit"); + xNode.Text = Services.TextService.Localize("treeHeaders/installStarterKit"); xNode.Menu.Clear(); break; diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs index 1e3f587c8e..3b2850deb9 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs @@ -1,4 +1,6 @@ -using System.Collections.Generic; + +using Umbraco.Core.Services; +using System.Collections.Generic; using System.Text; using Umbraco.Core; using umbraco.businesslogic; @@ -20,7 +22,7 @@ namespace umbraco { rootNode.NodeType = "init" + TreeAlias; rootNode.NodeID = "init"; - rootNode.Text = ui.Text("treeHeaders", "scripts"); + rootNode.Text = Services.TextService.Localize("treeHeaders/scripts"); } public override void RenderJS(ref StringBuilder Javascript) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadStylesheets.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadStylesheets.cs index 1bca231428..4cf03171d4 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadStylesheets.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadStylesheets.cs @@ -1,11 +1,9 @@ -using System; +using Umbraco.Core.Services; +using System; using System.Collections.Generic; -using System.Globalization; using System.Linq; using System.Text; using System.Web; -using umbraco.businesslogic; -using umbraco.cms.businesslogic.web; using umbraco.interfaces; using umbraco.cms.presentation.Trees; using Umbraco.Core; @@ -24,7 +22,7 @@ namespace umbraco { rootNode.NodeType = "init" + TreeAlias; rootNode.NodeID = "init"; - rootNode.Text = ui.Text("treeHeaders", "stylesheets"); + rootNode.Text = Services.TextService.Localize("treeHeaders/stylesheets"); } public override void RenderJS(ref StringBuilder Javascript) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTranslationTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTranslationTasks.cs index 8f55ce419b..fea5e51cfd 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTranslationTasks.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTranslationTasks.cs @@ -1,4 +1,5 @@ -using System; +using Umbraco.Core.Services; +using System; using System.Collections.Generic; using System.Text; using umbraco.BusinessLogic; @@ -15,7 +16,7 @@ namespace umbraco { protected override void CreateRootNode(ref XmlTreeNode rootNode) { rootNode.Action = "javascript:openTranslationOverview(" + currentUser().Id + ",'open');"; - rootNode.Text = ui.Text("translation", "assignedTasks"); + rootNode.Text = Services.TextService.Localize("translation/assignedTasks"); } protected override void CreateRootNodeActions(ref List actions) { @@ -69,7 +70,7 @@ namespace umbraco { protected override void CreateRootNode(ref XmlTreeNode rootNode) { rootNode.Action = "javascript:openTranslationOverview(" + currentUser().Id + ", 'owned');"; - rootNode.Text = ui.Text("translation", "ownedTasks"); + rootNode.Text = Services.TextService.Localize("translation/ownedTasks"); } protected override void CreateRootNodeActions(ref List actions) { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/actions/publish.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/actions/publish.aspx.cs index 64337fa724..f5b7386910 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/actions/publish.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/actions/publish.aspx.cs @@ -68,7 +68,7 @@ // string.Format("{0} ({1})", status.ContentItem.Name, status.ContentItem.Id), // UmbracoUser).Trim(); // case PublishStatusType.FailedCancelledByEvent: -// return ui.Text("speechBubbles", "contentPublishedFailedByEvent"); +// return Services.TextService.Localize("speechBubbles/contentPublishedFailedByEvent"); // case PublishStatusType.FailedHasExpired: // case PublishStatusType.FailedAwaitingRelease: // case PublishStatusType.FailedIsTrashed: diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentControl.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentControl.cs index 2a1316041f..1a1a6f40a8 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentControl.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentControl.cs @@ -170,7 +170,7 @@ // } // // Add property pane -// tpProp = NewTabPage(ui.Text("general", "properties")); +// tpProp = NewTabPage(Services.TextService.Localize("general/properties")); // AddSaveAndPublishButtons(ref tpProp); // tpProp.Controls.Add( // new LiteralControl("
x.PropertyType.SortOrder)) // { // if (inTab[p.PropertyType.Id.ToString()] == null) -// AddControlNew(p, tpProp, ui.Text("general", "properties")); +// AddControlNew(p, tpProp, Services.TextService.Localize("general/properties")); // } // } @@ -290,15 +290,15 @@ // NameTxtHolder.Controls.Add(NameTxt); // NameTxtHolder.Controls.Add(NameTxtValidator); // NameTxtHolder.Controls.Add(_nameTxtCustomValidator); -// PropertiesPane.addProperty(ui.Text("general", "name"), NameTxtHolder); +// PropertiesPane.addProperty(Services.TextService.Localize("general/name"), NameTxtHolder); // Literal ltt = new Literal(); // ltt.Text = _content.User.Name; -// PropertiesPane.addProperty(ui.Text("content", "createBy"), ltt); +// PropertiesPane.addProperty(Services.TextService.Localize("content/createBy"), ltt); // ltt = new Literal(); // ltt.Text = _content.CreateDateTime.ToString(); -// PropertiesPane.addProperty(ui.Text("content", "createDate"), ltt); +// PropertiesPane.addProperty(Services.TextService.Localize("content/createDate"), ltt); // ltt = new Literal(); // ltt.Text = _content.Id.ToString(); @@ -306,7 +306,7 @@ // if (_content is Media) // { -// PropertiesPane.addProperty(ui.Text("content", "mediatype"), new LiteralControl(_content.ContentType.Alias)); +// PropertiesPane.addProperty(Services.TextService.Localize("content/mediatype"), new LiteralControl(_content.ContentType.Alias)); // } // tpProp.Controls.AddAt(0, PropertiesPane); @@ -411,7 +411,7 @@ // menuSave.ImageUrl = UmbracoPath + "/images/editor/save.gif"; // menuSave.Click += new ImageClickEventHandler(SaveClick); // menuSave.OnClickCommand = "invokeSaveHandlers();"; -// menuSave.AltText = ui.Text("buttons", "save"); +// menuSave.AltText = Services.TextService.Localize("buttons/save"); // if (_canPublish == publishModes.Publish) // { // MenuImageButton menuPublish = tp.Menu.NewImageButton(); @@ -419,7 +419,7 @@ // menuPublish.ImageUrl = UmbracoPath + "/images/editor/saveAndPublish.gif"; // menuPublish.OnClickCommand = "invokeSaveHandlers();"; // menuPublish.Click += new ImageClickEventHandler(DoSaveAndPublish); -// menuPublish.AltText = ui.Text("buttons", "saveAndPublish"); +// menuPublish.AltText = Services.TextService.Localize("buttons/saveAndPublish"); // } // else if (_canPublish == publishModes.SendToPublish) // { @@ -428,7 +428,7 @@ // menuToPublish.ImageUrl = UmbracoPath + "/images/editor/saveToPublish.gif"; // menuToPublish.OnClickCommand = "invokeSaveHandlers();"; // menuToPublish.Click += new ImageClickEventHandler(DoSaveToPublish); -// menuToPublish.AltText = ui.Text("buttons", "saveToPublish"); +// menuToPublish.AltText = Services.TextService.Localize("buttons/saveToPublish"); // } // } @@ -493,7 +493,7 @@ // DropDownList ddl = tp.Menu.NewDropDownList(); // ddl.Style.Add("margin-bottom", "5px"); -// ddl.Items.Add(ui.Text("buttons", "styleChoose")); +// ddl.Items.Add(Services.TextService.Localize("buttons/styleChoose")); // ddl.ID = tp.ID + "_editorStyle"; // if (StyleSheet.GetAll().Length > 0) // { @@ -641,7 +641,7 @@ // var missingPropertyEditorLabel = new Literal // { -// Text = ui.Text("errors", "missingPropertyEditorErrorMessage") +// Text = Services.TextService.Localize("errors/missingPropertyEditorErrorMessage") // }; // pp.addProperty(p.PropertyType.Name, missingPropertyEditorLabel); diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControl.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControl.cs index e1b8617c50..a640548ab4 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControl.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControl.cs @@ -152,7 +152,7 @@ // if (TabTxt.Text.Trim() != "") // { // docType.AddVirtualTab(TabTxt.Text); -// xtra = ui.Text("speechBubbles", "contentTypeTabCreated"); +// xtra = Services.TextService.Localize("speechBubbles/contentTypeTabCreated"); // populateTabDDLs(); // TabsPane.Controls.Clear(); // LoadExistingTabsOnTabsPane(); @@ -163,7 +163,7 @@ // SaveAllowedChildTypes(); // NodeTypeEditorCtrl.Save(); -// prnt.ClientTools.ShowSpeechBubble( BasePages.BasePage.SpeechBubbleIcon.Save, ui.Text("speechBubbles", "contentTypeSavedHeader"),"" + xtra); +// prnt.ClientTools.ShowSpeechBubble( BasePages.BasePage.SpeechBubbleIcon.Save, Services.TextService.Localize("speechBubbles/contentTypeSavedHeader"),"" + xtra); // } // private void SaveAllowedChildTypes() { @@ -286,7 +286,7 @@ // LoadExistingTabsOnTabsPane(); // populateTabDDLs(); -// prnt.ClientTools.ShowSpeechBubble(BasePages.BasePage.speechBubbleIcon.info, ui.Text("speechBubbles", "contentTypeTabDeleted"), ui.Text("speechBubbles", "contentTypeTabDeletedText", b.ID)); +// prnt.ClientTools.ShowSpeechBubble(BasePages.BasePage.speechBubbleIcon.info, Services.TextService.Localize("speechBubbles/contentTypeTabDeleted"), ui.Text("speechBubbles", "contentTypeTabDeletedText", b.ID)); // } @@ -413,7 +413,7 @@ // if (NameTxt.Text.Trim() != "" && AliasTxt.Text.Trim() != "") // { // string[] info = {NameTxt.Text, DataTypeDDL.SelectedItem.Value}; -// ctctrl.prnt.ClientTools.ShowSpeechBubble(BasePages.BasePage.speechBubbleIcon.info, ui.Text("speechBubbles", "contentTypePropertyTypeCreated"), ui.Text("speechBubbles", "contentTypePropertyTypeCreatedText", info)); +// ctctrl.prnt.ClientTools.ShowSpeechBubble(BasePages.BasePage.speechBubbleIcon.info, Services.TextService.Localize("speechBubbles/contentTypePropertyTypeCreated"), ui.Text("speechBubbles", "contentTypePropertyTypeCreatedText", info)); // _dt.AddPropertyType(cms.businesslogic.datatype.DataTypeDefinition.GetDataTypeDefinition(int.Parse(DataTypeDDL.SelectedValue)),AliasTxt.Text,NameTxt.Text); // if (int.Parse(TabDDL.SelectedValue) != 0) @@ -430,7 +430,7 @@ // else // { -// ctctrl.prnt.ClientTools.ShowSpeechBubble(BasePages.BasePage.speechBubbleIcon.error, ui.Text("error"), ui.Text("errors", "contentTypeAliasAndNameNotNull")); +// ctctrl.prnt.ClientTools.ShowSpeechBubble(BasePages.BasePage.speechBubbleIcon.error, ui.Text("error"), Services.TextService.Localize("errors/contentTypeAliasAndNameNotNull")); // } // } // } @@ -554,7 +554,7 @@ // ent.loadGenericPropertyTypesOnPane(); // BasePages.BasePage bp = (BasePages.BasePage) this.Page; -// bp.ClientTools.ShowSpeechBubble(BasePages.BasePage.speechBubbleIcon.info, ui.Text("speechBubbles", "contentTypePropertyTypeDeleted"), ""); +// bp.ClientTools.ShowSpeechBubble(BasePages.BasePage.speechBubbleIcon.info, Services.TextService.Localize("speechBubbles/contentTypePropertyTypeDeleted"), ""); // ent.OnPropertyTypeDelete(this, new System.EventArgs()); // } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/dualSelectBox.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/dualSelectBox.cs index 34ad91303e..69568cfd8f 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/dualSelectBox.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/dualSelectBox.cs @@ -4,6 +4,8 @@ using System.Web.UI; using System.Web.UI.WebControls; using System.Web.UI.HtmlControls; using ClientDependency.Core; +using Umbraco.Core; +using Umbraco.Core.Services; namespace umbraco.controls { @@ -60,9 +62,9 @@ namespace umbraco.controls table.Border = 0; HtmlTableRow header = new HtmlTableRow(); - header.Controls.Add(new HtmlTableCell { InnerHtml = ui.Text("content", "notmemberof") }); + header.Controls.Add(new HtmlTableCell { InnerHtml = ApplicationContext.Current.Services.TextService.Localize("content/notmemberof") }); header.Controls.Add(new HtmlTableCell { InnerHtml= " " }); - header.Controls.Add(new HtmlTableCell { InnerHtml = ui.Text("content", "memberof") }); + header.Controls.Add(new HtmlTableCell { InnerHtml = ApplicationContext.Current.Services.TextService.Localize("content/memberof") }); table.Controls.Add(header); HtmlTableRow row = new HtmlTableRow(); diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/BrowseRepository.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/BrowseRepository.aspx.cs index 318d3defd9..a161f09693 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/BrowseRepository.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/BrowseRepository.aspx.cs @@ -1,16 +1,6 @@ using System; -using System.Collections; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Web; -using System.Web.SessionState; -using System.Web.UI; -using System.Web.UI.WebControls; -using System.Web.UI.HtmlControls; -using System.Xml; -using System.Xml.XPath; using Umbraco.Core; +using Umbraco.Core.Services; using Umbraco.Core.Configuration; using Umbraco.Core.IO; using Umbraco.Web; @@ -31,7 +21,7 @@ namespace umbraco.presentation.developer.packages { if (!cms.businesslogic.packager.Settings.HasFileAccess(ref ex)) { fb.Style.Add("margin-top", "7px"); fb.type = global::umbraco.uicontrols.Feedback.feedbacktype.error; - fb.Text = "" + ui.Text("errors", "filePermissionsError") + ":
" + ex.Message; + fb.Text = "" + Services.TextService.Localize("errors/filePermissionsError") + ":
" + ex.Message; } string category = Request.CleanForXss("category"); diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx.cs index 8b6c4afc6a..fc368ef351 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx.cs @@ -1,21 +1,13 @@ using System; -using System.Data; -using System.Configuration; -using System.Collections; using System.Collections.Generic; using System.Globalization; using System.Linq; -using System.Web; -using System.Web.Security; -using System.Web.UI; using System.Web.UI.WebControls; -using System.Web.UI.WebControls.WebParts; -using System.Web.UI.HtmlControls; using Umbraco.Core.IO; using Umbraco.Core; +using Umbraco.Core.Services; using Umbraco.Core.Logging; using Umbraco.Core.Models; -using umbraco.BusinessLogic; using umbraco.cms.businesslogic.web; using runtimeMacro = umbraco.macro; using System.Xml; @@ -604,32 +596,32 @@ namespace umbraco.presentation.developer.packages { base.OnInit(e); - Panel1.Text = ui.Text("treeHeaders", "installedPackages"); - pane_meta.Text = ui.Text("packager", "packageMetaData"); - pp_name.Text = ui.Text("packager", "packageName"); - pp_version.Text = ui.Text("packager", "packageVersion"); - pp_author.Text = ui.Text("packager", "packageAuthor"); - pp_repository.Text = ui.Text("packager", "packageRepository"); - pp_documentation.Text = ui.Text("packager", "packageDocumentation"); - pp_readme.Text = ui.Text("packager", "packageReadme"); - hl_docLink.Text = ui.Text("packager", "packageDocumentation"); - lb_demoLink.Text = ui.Text("packager", "packageDemonstration"); + Panel1.Text = Services.TextService.Localize("treeHeaders/installedPackages"); + pane_meta.Text = Services.TextService.Localize("packager/packageMetaData"); + pp_name.Text = Services.TextService.Localize("packager/packageName"); + pp_version.Text = Services.TextService.Localize("packager/packageVersion"); + pp_author.Text = Services.TextService.Localize("packager/packageAuthor"); + pp_repository.Text = Services.TextService.Localize("packager/packageRepository"); + pp_documentation.Text = Services.TextService.Localize("packager/packageDocumentation"); + pp_readme.Text = Services.TextService.Localize("packager/packageReadme"); + hl_docLink.Text = Services.TextService.Localize("packager/packageDocumentation"); + lb_demoLink.Text = Services.TextService.Localize("packager/packageDemonstration"); - pane_versions.Text = ui.Text("packager", "packageVersionHistory"); - pane_noItems.Text = ui.Text("packager", "packageNoItemsHeader"); + pane_versions.Text = Services.TextService.Localize("packager/packageVersionHistory"); + pane_noItems.Text = Services.TextService.Localize("packager/packageNoItemsHeader"); - pane_uninstall.Text = ui.Text("packager", "packageUninstallHeader"); - bt_deletePackage.Text = ui.Text("packager", "packageUninstallHeader"); - bt_confirmUninstall.Text = ui.Text("packager", "packageUninstallConfirm"); + pane_uninstall.Text = Services.TextService.Localize("packager/packageUninstallHeader"); + bt_deletePackage.Text = Services.TextService.Localize("packager/packageUninstallHeader"); + bt_confirmUninstall.Text = Services.TextService.Localize("packager/packageUninstallConfirm"); - pane_uninstalled.Text = ui.Text("packager", "packageUninstalledHeader"); + pane_uninstalled.Text = Services.TextService.Localize("packager/packageUninstalledHeader"); - var general = Panel1.NewTabPage(ui.Text("packager", "packageName")); + var general = Panel1.NewTabPage(Services.TextService.Localize("packager/packageName")); general.Controls.Add(pane_meta); general.Controls.Add(pane_versions); - var uninstall = Panel1.NewTabPage(ui.Text("packager", "packageUninstallHeader")); + var uninstall = Panel1.NewTabPage(Services.TextService.Localize("packager/packageUninstallHeader")); uninstall.Controls.Add(pane_noItems); uninstall.Controls.Add(pane_uninstall); uninstall.Controls.Add(pane_uninstalled); diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installer.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installer.aspx.cs index 8ceee94122..4009ad8ec0 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installer.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installer.aspx.cs @@ -1,21 +1,11 @@ using System; -using System.Collections; -using System.ComponentModel; -using System.Data; -using System.Drawing; using System.Globalization; using System.Threading; -using System.Web; -using System.Web.SessionState; using System.Web.UI; -using System.Web.UI.WebControls; -using System.Web.UI.HtmlControls; -using System.Xml; -using System.Xml.XPath; using Umbraco.Core.IO; +using Umbraco.Core.Services; using Umbraco.Core.Logging; using Umbraco.Web; -using umbraco.BusinessLogic; using umbraco.cms.presentation.Trees; using Umbraco.Core; using Umbraco.Web.UI.Pages; @@ -48,7 +38,7 @@ namespace umbraco.presentation.developer.packages { fb.Style.Add("margin-top", "7px"); fb.type = uicontrols.Feedback.feedbacktype.error; - fb.Text = "" + ui.Text("errors", "filePermissionsError") + ":
" + ex.Message; + fb.Text = "" + Services.TextService.Localize("errors/filePermissionsError") + ":
" + ex.Message; } if (!IsPostBack) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain2.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain2.aspx.cs index 4dcde7c512..d4f8636d5f 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain2.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain2.aspx.cs @@ -1,13 +1,11 @@ using System; -using System.Collections.Generic; using System.Text; using System.Linq; using Umbraco.Core; -using Umbraco.Core.Models; +using Umbraco.Core.Services; using Umbraco.Web.UI.Pages; using Umbraco.Web; using Umbraco.Web.LegacyActions; -using Umbraco.Web.Routing; using Umbraco.Web.WebServices; @@ -24,7 +22,7 @@ namespace umbraco.dialogs if (node == null) { - feedback.Text = ui.Text("assignDomain", "invalidNode"); + feedback.Text = Services.TextService.Localize("assignDomain/invalidNode"); pane_language.Visible = false; pane_domains.Visible = false; p_buttons.Visible = false; @@ -33,16 +31,16 @@ namespace umbraco.dialogs if (UmbracoUser.GetPermissions(node.Path).Contains(ActionAssignDomain.Instance.Letter) == false) { - feedback.Text = ui.Text("assignDomain", "permissionDenied"); + feedback.Text = Services.TextService.Localize("assignDomain/permissionDenied"); pane_language.Visible = false; pane_domains.Visible = false; p_buttons.Visible = false; return; } - pane_language.Title = ui.Text("assignDomain", "setLanguage"); - pane_domains.Title = ui.Text("assignDomain", "setDomains"); - prop_language.Text = ui.Text("assignDomain", "language"); + pane_language.Title = Services.TextService.Localize("assignDomain/setLanguage"); + pane_domains.Title = Services.TextService.Localize("assignDomain/setDomains"); + prop_language.Text = Services.TextService.Localize("assignDomain/language"); var nodeDomains = Services.DomainService.GetAssignedDomains(nodeId, true).ToArray(); var wildcard = nodeDomains.FirstOrDefault(d => d.IsWildcard); diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/RegexWs.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/RegexWs.aspx.cs index d4a777df4c..f3e3b5c9ef 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/RegexWs.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/RegexWs.aspx.cs @@ -1,14 +1,8 @@ using System; using System.Data; -using System.Configuration; -using System.Collections; -using System.Web; -using System.Web.Security; -using System.Web.UI; using System.Web.UI.WebControls; -using System.Web.UI.WebControls.WebParts; -using System.Web.UI.HtmlControls; using Umbraco.Core; +using Umbraco.Core.Services; namespace umbraco.presentation.dialogs { public partial class RegexWs : Umbraco.Web.UI.Pages.UmbracoEnsuredPage { @@ -21,8 +15,8 @@ namespace umbraco.presentation.dialogs { } protected void Page_Load(object sender, EventArgs e) { - pp_search.Text = ui.Text("general", "search"); - bt_search.Text = ui.Text("general", "search"); + pp_search.Text = Services.TextService.Localize("general/search"); + bt_search.Text = Services.TextService.Localize("general/search"); } protected void findRegex(object sender, EventArgs e) { @@ -43,7 +37,7 @@ namespace umbraco.presentation.dialogs { ds.Dispose(); } catch{ Literal err = new Literal(); - err.Text = "

" + ui.Text("defaultdialogs", "regexSearchError") + "

"; + err.Text = "

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

"; regexPanel.Controls.Clear(); regexPanel.Controls.Add(err); } 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 7b2f794bfa..6fef2368c4 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/moveOrCopy.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/moveOrCopy.aspx.cs @@ -38,7 +38,7 @@ namespace umbraco.dialogs // Put user code to initialize the page here if (IsPostBack == false) { - pp_relate.Text = ui.Text("moveOrCopy", "relateToOriginal"); + pp_relate.Text = Services.TextService.Localize("moveOrCopy/relateToOriginal"); //Document Type copy Hack... diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx.cs index 804bf908a6..0d931c467f 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx.cs @@ -35,13 +35,13 @@ // diffPanel.Visible = true; // Document rollback = new Document(currentDoc.Id, new Guid(allVersions.SelectedValue)); -// propertiesCompare.Text = "" + ui.Text("general", "name") + ":" + rollback.Text + ""; -// propertiesCompare.Text += "" + ui.Text("content", "createDate") + ":" + rollback.VersionDate.ToLongDateString() + " " + rollback.VersionDate.ToLongTimeString() + " " + ui.Text("general", "by") + ": " + rollback.User.Name + ""; +// propertiesCompare.Text = "" + Services.TextService.Localize("general/name") + ":" + rollback.Text + ""; +// propertiesCompare.Text += "" + Services.TextService.Localize("content/createDate") + ":" + rollback.VersionDate.ToLongDateString() + " " + rollback.VersionDate.ToLongTimeString() + " " + Services.TextService.Localize("general/by") + ": " + rollback.User.Name + ""; // if (rbl_mode.SelectedValue == "diff") -// lt_notice.Text = ui.Text("rollback", "diffHelp"); +// lt_notice.Text = Services.TextService.Localize("rollback/diffHelp"); // else -// lt_notice.Text = ui.Text("rollback", "htmlHelp"); +// lt_notice.Text = Services.TextService.Localize("rollback/htmlHelp"); // var props = rollback.GenericProperties; @@ -115,14 +115,14 @@ // rbl_mode.AutoPostBack = true; // currentVersionTitle.Text = currentDoc.Text; -// currentVersionMeta.Text = ui.Text("content", "createDate") + ": " + currentDoc.VersionDate.ToShortDateString() + " " + currentDoc.VersionDate.ToShortTimeString(); +// currentVersionMeta.Text = Services.TextService.Localize("content/createDate") + ": " + currentDoc.VersionDate.ToShortDateString() + " " + currentDoc.VersionDate.ToShortTimeString(); // if (!IsPostBack) { -// allVersions.Items.Add(new ListItem(ui.Text("rollback", "selectVersion")+ "...", "")); +// allVersions.Items.Add(new ListItem(Services.TextService.Localize("rollback/selectVersion")+ "...", "")); // foreach (DocumentVersionList dl in currentDoc.GetVersions()) { -// allVersions.Items.Add(new ListItem(dl.Text + " (" + ui.Text("content", "createDate") + ": " + dl.Date.ToShortDateString() + " " + dl.Date.ToShortTimeString() + ")", dl.Version.ToString())); +// allVersions.Items.Add(new ListItem(dl.Text + " (" + Services.TextService.Localize("content/createDate") + ": " + dl.Date.ToShortDateString() + " " + dl.Date.ToShortTimeString() + ")", dl.Version.ToString())); // } -// Button1.Text = ui.Text("actions", "rollback"); +// Button1.Text = Services.TextService.Localize("actions/rollback"); // } // } 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 91ea130d54..fa20514fc9 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sendToTranslation.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sendToTranslation.aspx.cs @@ -6,6 +6,7 @@ using umbraco.cms.businesslogic; using umbraco.BusinessLogic; using umbraco.uicontrols; using Umbraco.Core; +using Umbraco.Core.Services; using Umbraco.Core.IO; using Umbraco.Core.Logging; using Umbraco.Core.Models; @@ -73,7 +74,7 @@ namespace umbraco.presentation.dialogs translator.Items.Add(new ListItem(u.Name, u.Id.ToString())); if (translator.Items.Count == 0) { - feedback.Text = ui.Text("translation", "noTranslators"); + feedback.Text = Services.TextService.Localize("translation/noTranslators"); feedback.type = Feedback.feedbacktype.error; doTranslation.Enabled = false; } @@ -103,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) + "

" + ui.Text("defaultdialogs", "closeThisWindow") + "

"; + feedback.Text = ui.Text("translation","pageHasBeenSendToTranslation", _currentPage.Text, Security.CurrentUser) + "

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

"; feedback.type = Feedback.feedbacktype.success; } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sort.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sort.aspx.cs index f769d862ac..f55a08aead 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sort.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sort.aspx.cs @@ -1,6 +1,7 @@ using System; using System.Linq; using Umbraco.Core; +using Umbraco.Core.Services; using Umbraco.Web; using System.Web.UI; using System.Collections.Generic; @@ -30,7 +31,7 @@ namespace umbraco.cms.presentation protected void Page_Load(object sender, EventArgs e) { - sortDone.Text = ui.Text("sort", "sortDone"); + sortDone.Text = Services.TextService.Localize("sort/sortDone"); } protected override void OnPreRender(EventArgs e) { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/umbracoField.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/umbracoField.aspx.cs index 3fd2144f56..b3c735b174 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/umbracoField.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/umbracoField.aspx.cs @@ -1,18 +1,8 @@ -using System; -using System.Collections; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Web; -using System.Web.SessionState; -using System.Web.UI; +using System.Linq; using System.Web.UI.WebControls; -using System.Web.UI.HtmlControls; using Umbraco.Core.Configuration; using Umbraco.Core; -using Umbraco.Core.Persistence.SqlSyntax; -using umbraco.DataLayer; +using Umbraco.Core.Services; using Umbraco.Web; namespace umbraco.dialogs @@ -34,14 +24,14 @@ namespace umbraco.dialogs { //set labels on properties... - pp_insertAltField.Text = ui.Text("templateEditor", "alternativeField"); - pp_insertAltText.Text = ui.Text("templateEditor", "alternativeText"); - pp_insertBefore.Text = ui.Text("templateEditor", "preContent"); - pp_insertAfter.Text = ui.Text("templateEditor", "postContent"); + pp_insertAltField.Text = Services.TextService.Localize("templateEditor/alternativeField"); + pp_insertAltText.Text = Services.TextService.Localize("templateEditor/alternativeText"); + pp_insertBefore.Text = Services.TextService.Localize("templateEditor/preContent"); + pp_insertAfter.Text = Services.TextService.Localize("templateEditor/postContent"); - pp_FormatAsDate.Text = ui.Text("templateEditor", "formatAsDate"); - pp_casing.Text = ui.Text("templateEditor", "casing"); - pp_encode.Text = ui.Text("templateEditor", "encoding"); + pp_FormatAsDate.Text = Services.TextService.Localize("templateEditor/formatAsDate"); + pp_casing.Text = Services.TextService.Localize("templateEditor/casing"); + pp_encode.Text = Services.TextService.Localize("templateEditor/encoding"); @@ -67,12 +57,12 @@ namespace umbraco.dialogs fieldSql = string.Format( "select distinct alias from cmsPropertyType where alias not in ({0}) order by alias", string.Join(",", exclude)); - pp_insertField.Text = ui.Text("templateEditor", "chooseField"); + pp_insertField.Text = Services.TextService.Localize("templateEditor/chooseField"); } - fieldPicker.ChooseText = ui.Text("templateEditor", "chooseField"); - fieldPicker.StandardPropertiesLabel = ui.Text("templateEditor", "standardFields"); - fieldPicker.CustomPropertiesLabel = ui.Text("templateEditor", "customFields"); + fieldPicker.ChooseText = Services.TextService.Localize("templateEditor/chooseField"); + fieldPicker.StandardPropertiesLabel = Services.TextService.Localize("templateEditor/standardFields"); + fieldPicker.CustomPropertiesLabel = Services.TextService.Localize("templateEditor/customFields"); var dataTypes = DatabaseContext.Database.Fetch(fieldSql); fieldPicker.DataTextField = "alias"; @@ -81,9 +71,9 @@ namespace umbraco.dialogs fieldPicker.DataBind(); fieldPicker.Attributes.Add("onChange", "document.forms[0].field.value = document.forms[0]." + fieldPicker.ClientID + "[document.forms[0]." + fieldPicker.ClientID + ".selectedIndex].value;"); - altFieldPicker.ChooseText = ui.Text("templateEditor", "chooseField"); - altFieldPicker.StandardPropertiesLabel = ui.Text("templateEditor", "standardFields"); - altFieldPicker.CustomPropertiesLabel = ui.Text("templateEditor", "customFields"); + altFieldPicker.ChooseText = Services.TextService.Localize("templateEditor/chooseField"); + altFieldPicker.StandardPropertiesLabel = Services.TextService.Localize("templateEditor/standardFields"); + altFieldPicker.CustomPropertiesLabel = Services.TextService.Localize("templateEditor/customFields"); var dataTypes2 = DatabaseContext.Database.Fetch(fieldSql); altFieldPicker.DataTextField = "alias"; diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx.cs index 84d99d42ff..33992a91e2 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx.cs @@ -1,16 +1,9 @@ using System; -using System.Collections; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Web; -using System.Web.SessionState; using System.Web.UI; using System.Web.UI.WebControls; -using System.Web.UI.HtmlControls; using umbraco.cms.presentation.Trees; using Umbraco.Core; -using Umbraco.Core.IO; +using Umbraco.Core.Services; using Umbraco.Web.UI; namespace umbraco.settings @@ -93,7 +86,7 @@ namespace umbraco.settings currentItem.setValue(int.Parse(t.ID),t.Text); } } - ClientTools.ShowSpeechBubble(SpeechBubbleIcon.Save, ui.Text("speechBubbles", "dictionaryItemSaved"), ""); + ClientTools.ShowSpeechBubble(SpeechBubbleIcon.Save, Services.TextService.Localize("speechBubbles/dictionaryItemSaved"), ""); } #region Web Form Designer generated code override protected void OnInit(EventArgs e) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editLanguage.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editLanguage.aspx.cs index 175eacbbab..63dffef5bc 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editLanguage.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editLanguage.aspx.cs @@ -1,18 +1,10 @@ using System; using System.Collections; -using System.ComponentModel; -using System.Data; -using System.Drawing; using System.Globalization; -using System.Web; -using System.Web.SessionState; -using System.Web.UI; using System.Web.UI.WebControls; -using System.Web.UI.HtmlControls; -using umbraco.cms.presentation.Trees; using Umbraco.Core; +using Umbraco.Core.Services; using Umbraco.Web; -using Umbraco.Web.Trees; using Umbraco.Web.UI; namespace umbraco.settings @@ -76,7 +68,7 @@ namespace umbraco.settings currentLanguage.Save(); updateCultureList(); - ClientTools.ShowSpeechBubble(SpeechBubbleIcon.Save, ui.Text("speechBubbles", "languageSaved"), ""); + ClientTools.ShowSpeechBubble(SpeechBubbleIcon.Save, Services.TextService.Localize("speechBubbles/languageSaved"), ""); } #region Web Form Designer generated code @@ -90,7 +82,7 @@ namespace umbraco.settings save.ID = "save"; save.ButtonType = uicontrols.MenuButtonType.Primary; - Panel1.Text = ui.Text("language", "editLanguage"); + Panel1.Text = Services.TextService.Localize("language/editLanguage"); InitializeComponent(); base.OnInit(e); diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs index a4692f57e4..6045fa2692 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs @@ -4,15 +4,11 @@ using System.IO; using System.Web.UI; using System.Web.UI.WebControls; using Umbraco.Core; +using Umbraco.Core.Services; using Umbraco.Core.Configuration; using Umbraco.Core.IO; -using umbraco.BusinessLogic; - using umbraco.cms.businesslogic.template; -using umbraco.cms.presentation.Trees; -using umbraco.DataLayer; using umbraco.uicontrols; -using System.Linq; using Umbraco.Web.UI.Pages; namespace umbraco.cms.presentation.settings @@ -116,8 +112,8 @@ namespace umbraco.cms.presentation.settings umbField.OnClickCommand = ClientTools.Scripts.OpenModalWindow( IOHelper.ResolveUrl(SystemDirectories.Umbraco) + "/dialogs/umbracoField.aspx?objectId=" + - editorSource.ClientID + "&tagName=UMBRACOGETDATA", ui.Text("template", "insertPageField"), 640, 550); - umbField.AltText = ui.Text("template", "insertPageField"); + editorSource.ClientID + "&tagName=UMBRACOGETDATA", Services.TextService.Localize("template/insertPageField"), 640, 550); + umbField.AltText = Services.TextService.Localize("template/insertPageField"); // TODO: Update icon @@ -126,7 +122,7 @@ namespace umbraco.cms.presentation.settings umbDictionary.OnClickCommand = ClientTools.Scripts.OpenModalWindow( IOHelper.ResolveUrl(SystemDirectories.Umbraco) + "/dialogs/umbracoField.aspx?objectId=" + - editorSource.ClientID + "&tagName=UMBRACOGETDICTIONARY", ui.Text("template", "insertDictionaryItem"), + editorSource.ClientID + "&tagName=UMBRACOGETDICTIONARY", Services.TextService.Localize("template/insertDictionaryItem"), 640, 550); umbDictionary.AltText = "Insert umbraco dictionary item"; @@ -136,20 +132,20 @@ namespace umbraco.cms.presentation.settings { MenuIconI umbContainer = editorSource.Menu.NewIcon(); umbContainer.ImageURL = SystemDirectories.Umbraco + "/images/editor/masterpagePlaceHolder.gif"; - umbContainer.AltText = ui.Text("template", "insertContentAreaPlaceHolder"); + umbContainer.AltText = Services.TextService.Localize("template/insertContentAreaPlaceHolder"); umbContainer.OnClickCommand = ClientTools.Scripts.OpenModalWindow( IOHelper.ResolveUrl(SystemDirectories.Umbraco) + "/dialogs/insertMasterpagePlaceholder.aspx?&id=" + _template.Id, - ui.Text("template", "insertContentAreaPlaceHolder"), 470, 320); + Services.TextService.Localize("template/insertContentAreaPlaceHolder"), 470, 320); MenuIconI umbContent = editorSource.Menu.NewIcon(); umbContent.ImageURL = SystemDirectories.Umbraco + "/images/editor/masterpageContent.gif"; - umbContent.AltText = ui.Text("template", "insertContentArea"); + umbContent.AltText = Services.TextService.Localize("template/insertContentArea"); umbContent.OnClickCommand = ClientTools.Scripts.OpenModalWindow( IOHelper.ResolveUrl(SystemDirectories.Umbraco) + "/dialogs/insertMasterpageContent.aspx?id=" + - _template.Id, ui.Text("template", "insertContentArea"), 470, 300); + _template.Id, Services.TextService.Localize("template/insertContentArea"), 470, 300); } @@ -164,9 +160,9 @@ namespace umbraco.cms.presentation.settings helpIcon.OnClickCommand = ClientTools.Scripts.OpenModalWindow( IOHelper.ResolveUrl(SystemDirectories.Umbraco) + "/settings/modals/showumbracotags.aspx?alias=" + - _template.Alias, ui.Text("template", "quickGuide"), 600, 580); + _template.Alias, Services.TextService.Localize("template/quickGuide"), 600, 580); helpIcon.ImageURL = SystemDirectories.Umbraco + "/images/editor/help.png"; - helpIcon.AltText = ui.Text("template", "quickGuide"); + helpIcon.AltText = Services.TextService.Localize("template/quickGuide"); } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/scripts/editScript.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/scripts/editScript.aspx.cs index 4432223561..6880a8e45d 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/scripts/editScript.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/scripts/editScript.aspx.cs @@ -1,20 +1,11 @@ using System; -using System.Collections; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Web; -using System.Web.SessionState; using System.Web.UI; -using System.Web.UI.WebControls; -using System.Web.UI.HtmlControls; using System.IO; using Umbraco.Core; +using Umbraco.Core.Services; using Umbraco.Core.Configuration; using Umbraco.Core.IO; using umbraco.cms.presentation.Trees; -using System.Linq; using umbraco.uicontrols; namespace umbraco.cms.presentation.settings.scripts @@ -92,7 +83,7 @@ namespace umbraco.cms.presentation.settings.scripts editorSource.CodeBase = uicontrols.CodeArea.EditorType.HTML; - var editor = Panel1.NewTabPage(ui.Text("settings","script")); + var editor = Panel1.NewTabPage(Services.TextService.Localize("settings/script")); editor.Controls.Add(Pane7); var props = Panel1.NewTabPage(ui.Text("properties")); @@ -111,27 +102,27 @@ namespace umbraco.cms.presentation.settings.scripts Panel1.Menu.InsertSplitter(); uicontrols.MenuIconI umbField = Panel1.Menu.NewIcon(); umbField.ImageURL = SystemDirectories.Umbraco + "/images/editor/insField.gif"; - umbField.OnClickCommand = Umbraco.Web.UI.Pages.ClientTools.Scripts.OpenModalWindow(IOHelper.ResolveUrl(SystemDirectories.Umbraco) + "/dialogs/umbracoField.aspx?objectId=" + editorSource.ClientID + "&tagName=UMBRACOGETDATA", ui.Text("template", "insertPageField"), 640, 550); - umbField.AltText = ui.Text("template", "insertPageField"); + umbField.OnClickCommand = Umbraco.Web.UI.Pages.ClientTools.Scripts.OpenModalWindow(IOHelper.ResolveUrl(SystemDirectories.Umbraco) + "/dialogs/umbracoField.aspx?objectId=" + editorSource.ClientID + "&tagName=UMBRACOGETDATA", Services.TextService.Localize("template/insertPageField"), 640, 550); + umbField.AltText = Services.TextService.Localize("template/insertPageField"); // TODO: Update icon uicontrols.MenuIconI umbDictionary = Panel1.Menu.NewIcon(); umbDictionary.ImageURL = GlobalSettings.Path + "/images/editor/dictionaryItem.gif"; - umbDictionary.OnClickCommand = Umbraco.Web.UI.Pages.ClientTools.Scripts.OpenModalWindow(IOHelper.ResolveUrl(SystemDirectories.Umbraco) + "/dialogs/umbracoField.aspx?objectId=" + editorSource.ClientID + "&tagName=UMBRACOGETDICTIONARY", ui.Text("template", "insertDictionaryItem"), 640, 550); + umbDictionary.OnClickCommand = Umbraco.Web.UI.Pages.ClientTools.Scripts.OpenModalWindow(IOHelper.ResolveUrl(SystemDirectories.Umbraco) + "/dialogs/umbracoField.aspx?objectId=" + editorSource.ClientID + "&tagName=UMBRACOGETDICTIONARY", Services.TextService.Localize("template/insertDictionaryItem"), 640, 550); umbDictionary.AltText = "Insert umbraco dictionary item"; uicontrols.MenuIconI umbMacro = Panel1.Menu.NewIcon(); umbMacro.ImageURL = SystemDirectories.Umbraco + "/images/editor/insMacro.gif"; - umbMacro.AltText = ui.Text("template", "insertMacro"); - umbMacro.OnClickCommand = Umbraco.Web.UI.Pages.ClientTools.Scripts.OpenModalWindow(IOHelper.ResolveUrl(SystemDirectories.Umbraco) + "/dialogs/editMacro.aspx?objectId=" + editorSource.ClientID, ui.Text("template", "insertMacro"), 470, 530); + umbMacro.AltText = Services.TextService.Localize("template/insertMacro"); + umbMacro.OnClickCommand = Umbraco.Web.UI.Pages.ClientTools.Scripts.OpenModalWindow(IOHelper.ResolveUrl(SystemDirectories.Umbraco) + "/dialogs/editMacro.aspx?objectId=" + editorSource.ClientID, Services.TextService.Localize("template/insertMacro"), 470, 530); // Help Panel1.Menu.InsertSplitter(); uicontrols.MenuIconI helpIcon = Panel1.Menu.NewIcon(); - helpIcon.OnClickCommand = Umbraco.Web.UI.Pages.ClientTools.Scripts.OpenModalWindow(Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco) + "/settings/modals/showumbracotags.aspx?alias=", ui.Text("template", "quickGuide"), 600, 580); + helpIcon.OnClickCommand = Umbraco.Web.UI.Pages.ClientTools.Scripts.OpenModalWindow(Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco) + "/settings/modals/showumbracotags.aspx?alias=", Services.TextService.Localize("template/quickGuide"), 600, 580); helpIcon.ImageURL = SystemDirectories.Umbraco + "/images/editor/help.png"; - helpIcon.AltText = ui.Text("template", "quickGuide"); + helpIcon.AltText = Services.TextService.Localize("template/quickGuide"); } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/translation/default.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/translation/default.aspx.cs index 62e2a91593..519cfc7325 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/translation/default.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/translation/default.aspx.cs @@ -4,6 +4,7 @@ using System.IO; using System.Text; using System.Xml; using Umbraco.Core; +using Umbraco.Core.Services; using umbraco.cms.businesslogic.task; //using umbraco.cms.businesslogic.utilities; using Umbraco.Core.IO; @@ -30,28 +31,28 @@ namespace umbraco.presentation.translation tasks.Columns.Add("Language"); taskList.Columns[0].HeaderText = ui.Text("nodeName"); - taskList.Columns[1].HeaderText = ui.Text("translation", "taskAssignedBy"); + taskList.Columns[1].HeaderText = Services.TextService.Localize("translation/taskAssignedBy"); taskList.Columns[2].HeaderText = ui.Text("date"); - ((System.Web.UI.WebControls.HyperLinkField)taskList.Columns[3]).Text = ui.Text("translation", "details"); - ((System.Web.UI.WebControls.HyperLinkField)taskList.Columns[4]).Text = ui.Text("translation", "downloadTaskAsXml"); + ((System.Web.UI.WebControls.HyperLinkField)taskList.Columns[3]).Text = Services.TextService.Localize("translation/details"); + ((System.Web.UI.WebControls.HyperLinkField)taskList.Columns[4]).Text = Services.TextService.Localize("translation/downloadTaskAsXml"); Tasks ts = new Tasks(); if (Request["mode"] == "owned") { ts = Task.GetOwnedTasks(UmbracoContext.UmbracoUser, false); - pane_tasks.Text = ui.Text("translation", "ownedTasks"); - Panel2.Text = ui.Text("translation", "ownedTasks"); + pane_tasks.Text = Services.TextService.Localize("translation/ownedTasks"); + Panel2.Text = Services.TextService.Localize("translation/ownedTasks"); } else { ts = Task.GetTasks(UmbracoContext.UmbracoUser, false); - pane_tasks.Text = ui.Text("translation", "assignedTasks"); - Panel2.Text = ui.Text("translation", "assignedTasks"); + pane_tasks.Text = Services.TextService.Localize("translation/assignedTasks"); + Panel2.Text = Services.TextService.Localize("translation/assignedTasks"); } uploadFile.Text = ui.Text("upload"); - pane_uploadFile.Text = ui.Text("translation", "uploadTranslationXml"); + pane_uploadFile.Text = Services.TextService.Localize("translation/uploadTranslationXml"); foreach (Task t in ts) { @@ -120,12 +121,12 @@ namespace umbraco.presentation.translation } feedback.type = global::umbraco.uicontrols.Feedback.feedbacktype.success; - feedback.Text = "

" + ui.Text("translation", "MultipleTranslationDone") + "

" + ui.Text("translation", "translationDoneHelp") + "

    " + sb.ToString() + "
"; + feedback.Text = "

" + Services.TextService.Localize("translation/MultipleTranslationDone") + "

" + Services.TextService.Localize("translation/translationDoneHelp") + "

    " + sb.ToString() + "
"; } catch (Exception ex) { feedback.type = global::umbraco.uicontrols.Feedback.feedbacktype.error; - feedback.Text = "

" + ui.Text("translation", "translationFailed") + "

" + ex.ToString() + ""; + feedback.Text = "

" + Services.TextService.Localize("translation/translationFailed") + "

" + ex.ToString() + ""; } } else @@ -136,7 +137,7 @@ namespace umbraco.presentation.translation if (l.Count == 1) { feedback.type = global::umbraco.uicontrols.Feedback.feedbacktype.success; - feedback.Text = "

" + ui.Text("translation", "translationDone") + "

" + ui.Text("translation", "translationDoneHelp") + "

" + ui.Text("preview") + "

"; + feedback.Text = "

" + Services.TextService.Localize("translation/translationDone") + "

" + Services.TextService.Localize("translation/translationDoneHelp") + "

" + ui.Text("preview") + "

"; } else @@ -147,7 +148,7 @@ namespace umbraco.presentation.translation } feedback.type = global::umbraco.uicontrols.Feedback.feedbacktype.success; - feedback.Text = "

" + ui.Text("translation", "MultipleTranslationDone") + "

" + ui.Text("translation", "translationDoneHelp") + "

    " + sb.ToString() + "
"; + feedback.Text = "

" + Services.TextService.Localize("translation/MultipleTranslationDone") + "

" + Services.TextService.Localize("translation/translationDoneHelp") + "

    " + sb.ToString() + "
"; } } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/translation/details.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/translation/details.aspx.cs index ff27556053..e3cfa6d505 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/translation/details.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/translation/details.aspx.cs @@ -4,6 +4,7 @@ using System.Web.UI.WebControls; using umbraco.cms.businesslogic.task; using umbraco.cms.businesslogic.web; using Umbraco.Core; +using Umbraco.Core.Services; namespace umbraco.presentation.umbraco.translation { public partial class details : Umbraco.Web.UI.Pages.UmbracoEnsuredPage { @@ -34,18 +35,18 @@ namespace umbraco.presentation.umbraco.translation { Literal lt = new Literal(); lt.Text = t.Date.ToLongDateString() + " " + t.Date.ToLongTimeString(); pp_date.Controls.Add(lt); - pp_date.Text = ui.Text("translation","taskOpened"); + pp_date.Text = Services.TextService.Localize("translation/taskOpened"); lt = new Literal(); lt.Text = t.ParentUser.Name; pp_owner.Controls.Add(lt); - pp_owner.Text = ui.Text("translation", "taskAssignedBy"); + pp_owner.Text = Services.TextService.Localize("translation/taskAssignedBy"); //TODO: Make this work again with correct APIs and angularized - so none of this code will exist anymore //lt = new Literal(); //lt.Text = Translation.CountWords(t.Node.Id).ToString(); //pp_totalWords.Controls.Add(lt); - //pp_totalWords.Text = ui.Text("translation", "totalWords"); + //pp_totalWords.Text = Services.TextService.Localize("translation/totalWords"); lt = new Literal(); lt.Text = library.ReplaceLineBreaks(t.Comment); @@ -55,22 +56,22 @@ namespace umbraco.presentation.umbraco.translation { lt = new Literal(); lt.Text = "" + ui.Text("download") + ""; pp_xml.Controls.Add(lt); - pp_xml.Text = ui.Text("translation", "downloadTaskAsXml"); + pp_xml.Text = Services.TextService.Localize("translation/downloadTaskAsXml"); - pane_details.Text = ui.Text("translation", "details"); - panel1.Text = ui.Text("translation", "details"); + pane_details.Text = Services.TextService.Localize("translation/details"); + panel1.Text = Services.TextService.Localize("translation/details"); - pane_fields.Text = ui.Text("translation", "fields"); - pane_tasks.Text = ui.Text("translation", "translationOptions"); + pane_fields.Text = Services.TextService.Localize("translation/fields"); + pane_tasks.Text = Services.TextService.Localize("translation/translationOptions"); lt = new Literal(); lt.Text = "" + ui.Text("upload") + ""; pp_upload.Controls.Add(lt); - pp_upload.Text = ui.Text("translation", "uploadTranslationXml"); + pp_upload.Text = Services.TextService.Localize("translation/uploadTranslationXml"); if (t.Closed) pp_closeTask.Visible = false; else { - pp_closeTask.Text = ui.Text("translation", "closeTask"); + pp_closeTask.Text = Services.TextService.Localize("translation/closeTask"); bt_close.Text = ui.Text("close"); } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionEditor.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionEditor.aspx.cs index b4e49308f5..b0e82d1b80 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionEditor.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionEditor.aspx.cs @@ -1,3 +1,4 @@ +using Umbraco.Core.Services; using System; using System.Web.UI; using Umbraco.Core; @@ -45,8 +46,8 @@ namespace umbraco.cms.presentation.user nodePermissions.UserID = Convert.ToInt32(Request.QueryString["id"]); - pnlUmbraco.Text = ui.Text("user", "userPermissions"); - pnl1.Text = ui.Text("user", "permissionSelectPages"); + pnlUmbraco.Text = Services.TextService.Localize("user/userPermissions"); + pnl1.Text = Services.TextService.Localize("user/permissionSelectPages"); if (!IsPostBack) { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/codeEditorSave.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/codeEditorSave.asmx.cs index ac681391f4..c0478bc055 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/codeEditorSave.asmx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/codeEditorSave.asmx.cs @@ -124,7 +124,7 @@ namespace umbraco.presentation.webservices } else { - //errorMessage = ui.Text("developer", "xsltErrorNoNodesPublished"); + //errorMessage = Services.TextService.Localize("developer/xsltErrorNoNodesPublished"); File.Delete(tempFileName); //base.speechBubble(speechBubbleIcon.info, ui.Text("errors", "xsltErrorHeader", Security.CurrentUser), "Unable to validate xslt as no published content nodes exist."); }