From abbd45c4768d19dc75237450ba60633d74c992a8 Mon Sep 17 00:00:00 2001 From: Kenn Jacobsen Date: Fri, 18 Jan 2019 09:04:59 +0100 Subject: [PATCH] Remove hardcoded "Root" when restoring to tree root --- .../src/views/content/content.restore.controller.js | 8 ++++++-- .../src/views/media/media.restore.controller.js | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.restore.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.restore.controller.js index 24457f6980..ddc23c7372 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/content.restore.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/content/content.restore.controller.js @@ -1,5 +1,5 @@ angular.module("umbraco").controller("Umbraco.Editors.Content.RestoreController", - function ($scope, relationResource, contentResource, entityResource, navigationService, appState, treeService, userService) { + function ($scope, relationResource, contentResource, entityResource, navigationService, appState, treeService, userService, localizationService) { $scope.source = _.clone($scope.currentNode); @@ -20,6 +20,10 @@ angular.module("umbraco").controller("Umbraco.Editors.Content.RestoreController" userService.getCurrentUser().then(function (userData) { $scope.treeModel.hideHeader = userData.startContentIds.length > 0 && userData.startContentIds.indexOf(-1) == -1; }); + $scope.labels = {}; + localizationService.localizeMany(["treeHeaders_content"]).then(function (data) { + $scope.labels.treeRoot = data[0]; + }); function nodeSelectHandler(args) { @@ -92,7 +96,7 @@ angular.module("umbraco").controller("Umbraco.Editors.Content.RestoreController" $scope.relation = data[0]; if ($scope.relation.parentId === -1) { - $scope.target = { id: -1, name: "Root" }; + $scope.target = { id: -1, name: $scope.labels.treeRoot }; } else { $scope.loading = true; diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.restore.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.restore.controller.js index 2c615db4dc..556101c53d 100644 --- a/src/Umbraco.Web.UI.Client/src/views/media/media.restore.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/media/media.restore.controller.js @@ -1,5 +1,5 @@ angular.module("umbraco").controller("Umbraco.Editors.Media.RestoreController", - function ($scope, relationResource, mediaResource, entityResource, navigationService, appState, treeService, userService) { + function ($scope, relationResource, mediaResource, entityResource, navigationService, appState, treeService, userService, localizationService) { $scope.source = _.clone($scope.currentNode); @@ -20,6 +20,10 @@ angular.module("umbraco").controller("Umbraco.Editors.Media.RestoreController", userService.getCurrentUser().then(function (userData) { $scope.treeModel.hideHeader = userData.startContentIds.length > 0 && userData.startContentIds.indexOf(-1) == -1; }); + $scope.labels = {}; + localizationService.localizeMany(["treeHeaders_media"]).then(function (data) { + $scope.labels.treeRoot = data[0]; + }); function nodeSelectHandler(args) { @@ -92,7 +96,7 @@ angular.module("umbraco").controller("Umbraco.Editors.Media.RestoreController", $scope.relation = data[0]; if ($scope.relation.parentId === -1) { - $scope.target = { id: -1, name: "Root" }; + $scope.target = { id: -1, name: $scope.labels.treeRoot }; } else { $scope.loading = true;