diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.controller.js index 35ac54ae7c..9aceb5bcfc 100644 --- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.controller.js @@ -9,15 +9,18 @@ (function() { 'use strict'; - function PermissionsController($scope, contentTypeResource, iconHelper, contentTypeHelper) { + function PermissionsController($scope, contentTypeResource, iconHelper, contentTypeHelper, localizationService) { /* ----------- SCOPE VARIABLES ----------- */ var vm = this; + var childNodeSelectorOverlayTitle = ""; vm.contentTypes = []; vm.selectedChildren = []; + vm.overlayTitle = ""; + vm.addChild = addChild; vm.removeChild = removeChild; @@ -27,6 +30,8 @@ function init() { + childNodeSelectorOverlayTitle = localizationService.localize("contentTypeEditor_chooseChildNode").then(function (value) {return value;}); + contentTypeResource.getAll().then(function(contentTypes){ vm.contentTypes = contentTypes; @@ -47,7 +52,7 @@ function addChild($event) { vm.childNodeSelectorOverlay = { view: "itempicker", - title: "Choose child node", + title: childNodeSelectorOverlayTitle, availableItems: vm.contentTypes, selectedItems: vm.selectedChildren, event: $event, diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html index 8563d9fbfb..d9c7d185da 100644 --- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html +++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html @@ -3,12 +3,13 @@
-
Allow as root
- Allow editors to create content if this type in the root of the content tree +
+
@@ -17,8 +18,8 @@
-
Allowed child node types
- Allow content of these types to be created underneath content this type +
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/views/permissions/permissions.controller.js b/src/Umbraco.Web.UI.Client/src/views/mediatypes/views/permissions/permissions.controller.js index e42d89c6c6..dbe29819a0 100644 --- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/views/permissions/permissions.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/views/permissions/permissions.controller.js @@ -1,11 +1,12 @@ (function() { 'use strict'; - function PermissionsController($scope, mediaTypeResource, iconHelper, contentTypeHelper) { + function PermissionsController($scope, mediaTypeResource, iconHelper, contentTypeHelper, localizationService) { /* ----------- SCOPE VARIABLES ----------- */ var vm = this; + var childNodeSelectorOverlayTitle = ""; vm.mediaTypes = []; vm.selectedChildren = []; @@ -19,6 +20,8 @@ function init() { + childNodeSelectorOverlayTitle = localizationService.localize("contentTypeEditor_chooseChildNode").then(function (value) {return value;}); + mediaTypeResource.getAll().then(function(mediaTypes){ vm.mediaTypes = mediaTypes; @@ -39,7 +42,7 @@ function addChild($event) { vm.childNodeSelectorOverlay = { view: "itempicker", - title: "Choose child node", + title: childNodeSelectorOverlayTitle, availableItems: vm.mediaTypes, selectedItems: vm.selectedChildren, event: $event, diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/views/permissions/permissions.html b/src/Umbraco.Web.UI.Client/src/views/mediatypes/views/permissions/permissions.html index 44fc6374f3..7c9811e37a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/views/permissions/permissions.html +++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/views/permissions/permissions.html @@ -3,12 +3,13 @@
-
Allow as root
- Allow editors to create content if this type in the root of the content tree +
+
@@ -17,8 +18,8 @@
-
Allowed child node types
- Allow content of these types to be created underneath content this type +
+
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index fdbbe3c581..d72f7c4193 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -918,6 +918,17 @@ To manage your website, simply open the Umbraco back office and start adding con Allow all row configurations + + Allow as root + Allow editors to create content of this type in the root of the content tree + Yes - allow content of this type in the root + + Allowed child node types + Allow content of the specified types to be created underneath content of this type + + Choose child node + + Alternative field Alternative Text