diff --git a/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js index 84d08c181d..02a531beba 100644 --- a/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js @@ -7,9 +7,7 @@ var localizeSaving = localizationService.localize("general_saving"); - vm.page = {}; - vm.page.contentRootLabel = "Content Root"; - vm.page.mediaRootLabel = "Media Root"; + vm.page = {}; vm.page.rootIcon = "icon-folder"; vm.userGroup = {}; vm.labels = {}; @@ -34,7 +32,9 @@ "defaultdialogs_selectContentStartNode", "defaultdialogs_selectMediaStartNode", "defaultdialogs_selectNode", - "general_groups" + "general_groups", + "content_contentRoot", + "media_mediaRoot" ]; localizationService.localizeMany(labelKeys).then(function (values) { @@ -43,6 +43,8 @@ vm.labels.selectMediaStartNode = values[2]; vm.labels.selectNode = values[3]; vm.labels.groups = values[4]; + vm.labels.contentRoot = values[5]; + vm.labels.mediaRoot = values[6]; }); localizationService.localize("general_add").then(function (name) { vm.labels.add = name; @@ -133,7 +135,7 @@ if (model.selection) { vm.userGroup.contentStartNode = model.selection[0]; if (vm.userGroup.contentStartNode.id === "-1") { - vm.userGroup.contentStartNode.name = "Content Root"; + vm.userGroup.contentStartNode.name = vm.labels.contentRoot; vm.userGroup.contentStartNode.icon = "icon-folder"; } } @@ -161,7 +163,7 @@ if (model.selection) { vm.userGroup.mediaStartNode = model.selection[0]; if (vm.userGroup.mediaStartNode.id === "-1") { - vm.userGroup.mediaStartNode.name = "Media Root"; + vm.userGroup.mediaStartNode.name = vm.labels.mediaRoot; vm.userGroup.mediaStartNode.icon = "icon-folder"; } } diff --git a/src/Umbraco.Web.UI.Client/src/views/users/group.html b/src/Umbraco.Web.UI.Client/src/views/users/group.html index a5ff0abad0..4e71fc88a6 100644 --- a/src/Umbraco.Web.UI.Client/src/views/users/group.html +++ b/src/Umbraco.Web.UI.Client/src/views/users/group.html @@ -80,9 +80,9 @@ diff --git a/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js index c48a276a7a..b7121824ac 100644 --- a/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js @@ -6,8 +6,6 @@ var vm = this; vm.page = {}; - vm.page.contentRootLabel = "Content Root"; - vm.page.mediaRootLabel = "Media Root"; vm.page.rootIcon = "icon-folder"; vm.user = { changePassword: null @@ -39,7 +37,9 @@ "general_cancel", "defaultdialogs_selectContentStartNode", "defaultdialogs_selectMediaStartNode", - "sections_users" + "sections_users", + "content_contentRoot", + "media_mediaRoot" ]; localizationService.localizeMany(labelKeys).then(function (values) { @@ -48,6 +48,8 @@ vm.labels.selectContentStartNode = values[2]; vm.labels.selectMediaStartNode = values[3]; vm.labels.users = values[4]; + vm.labels.contentRoot = values[5]; + vm.labels.mediaRoot = values[6]; }); // get user @@ -150,7 +152,7 @@ if (model.selection) { angular.forEach(model.selection, function (item) { if (item.id === "-1") { - item.name = "Content Root"; + item.name = vm.labels.contentRoot; item.icon = "icon-folder"; } multiSelectItem(item, vm.user.startContentIds); @@ -183,7 +185,7 @@ if (model.selection) { angular.forEach(model.selection, function (item) { if (item.id === "-1") { - item.name = "Media Root"; + item.name = vm.labels.mediaRoot; item.icon = "icon-folder"; } multiSelectItem(item, vm.user.startMediaIds); diff --git a/src/Umbraco.Web.UI.Client/src/views/users/user.html b/src/Umbraco.Web.UI.Client/src/views/users/user.html index 55c2a3c787..a0c68dab13 100644 --- a/src/Umbraco.Web.UI.Client/src/views/users/user.html +++ b/src/Umbraco.Web.UI.Client/src/views/users/user.html @@ -110,8 +110,7 @@ diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index f0e020fd27..289260b2a6 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -216,6 +216,7 @@ Blueprint created Blueprint was created from %0% Another Blueprint with the same name already exists. + Content root Click to upload @@ -224,6 +225,7 @@ or click here to choose files Only allowed file types are Max file size is + Media root Create a new member diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml index 58808a35cb..6ce06bfd16 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml @@ -205,6 +205,7 @@ What does this mean?]]> Add another text box Remove this text box + Content root Click to upload @@ -214,6 +215,7 @@ Only allowed file types are Cannot upload this file, it does not have an approved file type Max file size is + Media root Create a new member diff --git a/src/Umbraco.Web/Models/Mapping/UserModelMapper.cs b/src/Umbraco.Web/Models/Mapping/UserModelMapper.cs index 3c1c1d060b..bb7cc7c308 100644 --- a/src/Umbraco.Web/Models/Mapping/UserModelMapper.cs +++ b/src/Umbraco.Web/Models/Mapping/UserModelMapper.cs @@ -261,7 +261,7 @@ namespace Umbraco.Web.Models.Mapping var startNodes = new List(); if (startContentIds.Contains(-1)) { - startNodes.Add(RootNode("Content Root")); + startNodes.Add(RootNode(applicationContext.Services.TextService.Localize("content/contentRoot"))); } var contentItems = applicationContext.Services.EntityService.GetAll(UmbracoObjectTypes.Document, startContentIds); startNodes.AddRange(Mapper.Map, IEnumerable>(contentItems)); @@ -275,7 +275,7 @@ namespace Umbraco.Web.Models.Mapping var startNodes = new List(); if (startContentIds.Contains(-1)) { - startNodes.Add(RootNode("Media Root")); + startNodes.Add(RootNode(applicationContext.Services.TextService.Localize("media/mediaRoot"))); } var mediaItems = applicationContext.Services.EntityService.GetAll(UmbracoObjectTypes.Media, startMediaIds); startNodes.AddRange(Mapper.Map, IEnumerable>(mediaItems)); @@ -376,7 +376,7 @@ namespace Umbraco.Web.Models.Mapping else if (group.StartMediaId == -1) { //create the root node - display.MediaStartNode = RootNode("Media Root"); + display.MediaStartNode = RootNode(services.TextService.Localize("media/mediaRoot")); } if (group.StartContentId > 0) @@ -387,7 +387,7 @@ namespace Umbraco.Web.Models.Mapping else if (group.StartContentId == -1) { //create the root node - display.ContentStartNode = RootNode("Content Root"); + display.ContentStartNode = RootNode(services.TextService.Localize("content/contentRoot")); } if (display.Icon.IsNullOrWhiteSpace())