From cefa2c9040ed6033aa4774ff253a14fc38334673 Mon Sep 17 00:00:00 2001 From: Nicholas-Westby Date: Wed, 16 Jan 2019 13:42:23 -0800 Subject: [PATCH 1/5] Typo ("thist"). --- .../config/umbracoSettings.Release.config | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.Release.config b/src/Umbraco.Web.UI/config/umbracoSettings.Release.config index 2d663aa1fb..3442fefdfe 100644 --- a/src/Umbraco.Web.UI/config/umbracoSettings.Release.config +++ b/src/Umbraco.Web.UI/config/umbracoSettings.Release.config @@ -6,11 +6,11 @@ https://our.umbraco.com/documentation/using-umbraco/config-files/umbracoSettings/ Many of the optional settings are not explicitly listed here but can be found in the online documentation. - --> - + --> + - + @@ -32,7 +32,7 @@ - + your@email.here @@ -61,14 +61,14 @@ true - assets/img/installer.jpg + assets/img/installer.jpg false - + true false From 54faeee8370508fa2dafe9b8942622f216f91458 Mon Sep 17 00:00:00 2001 From: Callum Whyte Date: Thu, 17 Jan 2019 11:19:44 +1100 Subject: [PATCH 2/5] Updating number of active Umbraco sites in installer screen facts --- src/Umbraco.Web.UI.Client/src/installer/installer.service.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/installer/installer.service.js b/src/Umbraco.Web.UI.Client/src/installer/installer.service.js index a174de1271..f89f6ae6e7 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/installer.service.js +++ b/src/Umbraco.Web.UI.Client/src/installer/installer.service.js @@ -17,7 +17,7 @@ angular.module("umbraco.install").factory('installerService', function($rootScop //add to umbraco installer facts here var facts = ['Umbraco helped millions of people watch a man jump from the edge of space', - 'Over 440 000 websites are currently powered by Umbraco', + 'Over 500 000 websites are currently powered by Umbraco', "At least 2 people have named their cat 'Umbraco'", 'On an average day, more than 1000 people download Umbraco', 'umbraco.tv is the premier source of Umbraco video tutorials to get you started', From 5a78c000a06cd7db6bd8ed993bb43854cf569dee Mon Sep 17 00:00:00 2001 From: Callum Whyte Date: Thu, 17 Jan 2019 11:21:26 +1100 Subject: [PATCH 3/5] Correcting punctuation in installer screen facts --- .../src/installer/installer.service.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/installer/installer.service.js b/src/Umbraco.Web.UI.Client/src/installer/installer.service.js index f89f6ae6e7..7b802d9f7b 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/installer.service.js +++ b/src/Umbraco.Web.UI.Client/src/installer/installer.service.js @@ -19,14 +19,14 @@ angular.module("umbraco.install").factory('installerService', function($rootScop var facts = ['Umbraco helped millions of people watch a man jump from the edge of space', 'Over 500 000 websites are currently powered by Umbraco', "At least 2 people have named their cat 'Umbraco'", - 'On an average day, more than 1000 people download Umbraco', - 'umbraco.tv is the premier source of Umbraco video tutorials to get you started', - 'You can find the world\'s friendliest CMS community at our.umbraco.com', + 'On an average day more than 1000 people download Umbraco', + 'umbraco.tv is the premier source of Umbraco video tutorials to get you started', + 'You can find the world\'s friendliest CMS community at our.umbraco.com', 'You can become a certified Umbraco developer by attending one of the official courses', 'Umbraco works really well on tablets', 'You have 100% control over your markup and design when crafting a website in Umbraco', 'Umbraco is the best of both worlds: 100% free and open source, and backed by a professional and profitable company', - "There's a pretty big chance, you've visited a website powered by Umbraco today", + "There's a pretty big chance you've visited a website powered by Umbraco today", "'Umbraco-spotting' is the game of spotting big brands running Umbraco", "At least 4 people have the Umbraco logo tattooed on them", "'Umbraco' is the Danish name for an allen key", From e60417925bd02c16aea0ee54e8d393d367a26c24 Mon Sep 17 00:00:00 2001 From: Callum Whyte Date: Thu, 17 Jan 2019 11:28:22 +1100 Subject: [PATCH 4/5] Consistency is king! Fix up " vs ' in installer service facts array --- .../src/installer/installer.service.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/installer/installer.service.js b/src/Umbraco.Web.UI.Client/src/installer/installer.service.js index 7b802d9f7b..4419289744 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/installer.service.js +++ b/src/Umbraco.Web.UI.Client/src/installer/installer.service.js @@ -16,16 +16,16 @@ angular.module("umbraco.install").factory('installerService', function($rootScop }; //add to umbraco installer facts here - var facts = ['Umbraco helped millions of people watch a man jump from the edge of space', - 'Over 500 000 websites are currently powered by Umbraco', + var facts = ["Umbraco helped millions of people watch a man jump from the edge of space", + "Over 500 000 websites are currently powered by Umbraco", "At least 2 people have named their cat 'Umbraco'", - 'On an average day more than 1000 people download Umbraco', - 'umbraco.tv is the premier source of Umbraco video tutorials to get you started', - 'You can find the world\'s friendliest CMS community at our.umbraco.com', - 'You can become a certified Umbraco developer by attending one of the official courses', - 'Umbraco works really well on tablets', - 'You have 100% control over your markup and design when crafting a website in Umbraco', - 'Umbraco is the best of both worlds: 100% free and open source, and backed by a professional and profitable company', + "On an average day more than 1000 people download Umbraco", + "umbraco.tv is the premier source of Umbraco video tutorials to get you started", + "You can find the world's friendliest CMS community at our.umbraco.com", + "You can become a certified Umbraco developer by attending one of the official courses", + "Umbraco works really well on tablets", + "You have 100% control over your markup and design when crafting a website in Umbraco", + "Umbraco is the best of both worlds: 100% free and open source, and backed by a professional and profitable company", "There's a pretty big chance you've visited a website powered by Umbraco today", "'Umbraco-spotting' is the game of spotting big brands running Umbraco", "At least 4 people have the Umbraco logo tattooed on them", From 5b285f71fa5572a930dafc8a70c3c2fbe4f3e9d6 Mon Sep 17 00:00:00 2001 From: Kenn Jacobsen Date: Fri, 18 Jan 2019 08:40:50 +0100 Subject: [PATCH 5/5] 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 cb6a85fbb1..1b99d01ef9 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, navigationService, appState, treeService, userService) { + function ($scope, relationResource, contentResource, navigationService, appState, treeService, userService, localizationService) { var dialogOptions = $scope.dialogOptions; $scope.source = _.clone(dialogOptions.currentNode); @@ -21,6 +21,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(ev, args) { @@ -96,7 +100,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 bc02217660..587580bc27 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, navigationService, appState, treeService, userService) { + function ($scope, relationResource, mediaResource, navigationService, appState, treeService, userService, localizationService) { var dialogOptions = $scope.dialogOptions; $scope.source = _.clone(dialogOptions.currentNode); @@ -21,6 +21,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(ev, args) { @@ -96,7 +100,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;