diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorpicker/editorpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorpicker/editorpicker.controller.js index 4c2c281c1e..01ba9b128f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorpicker/editorpicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorpicker/editorpicker.controller.js @@ -14,6 +14,10 @@ var vm = this; + if(!$scope.model.title) { + $scope.model.title = localizationService.localize("defaultdialogs_selectEditor").then(function (value) {return value;}); + } + vm.searchTerm = ""; vm.showTabs = false; vm.tabsLoaded = 0; diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/propertysettings/propertysettings.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/propertysettings/propertysettings.controller.js index 70fc5665fb..c41c6261a1 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/propertysettings/propertysettings.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/propertysettings/propertysettings.controller.js @@ -65,7 +65,6 @@ vm.focusOnMandatoryField = false; vm.editorPickerOverlay = {}; - vm.editorPickerOverlay.title = "Choose editor"; vm.editorPickerOverlay.property = $scope.model.property; vm.editorPickerOverlay.contentTypeName = $scope.model.contentTypeName; vm.editorPickerOverlay.view = "views/common/overlays/contenttypeeditor/editorpicker/editorpicker.html"; diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/copy/copy.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/copy/copy.controller.js index 1476b852f2..6b31fc17d9 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/copy/copy.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/copy/copy.controller.js @@ -5,6 +5,10 @@ var vm = this; + if(!$scope.model.title) { + $scope.model.title = localizationService.localize("general_copy").then(function (value) {return value;}); + } + vm.hideSearch = hideSearch; vm.selectResult = selectResult; vm.onSearchResults = onSearchResults; diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/embed/embed.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/embed/embed.controller.js index 20568c8ae5..e912758f0d 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/embed/embed.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/embed/embed.controller.js @@ -1,13 +1,16 @@ (function() { "use strict"; - function EmbedOverlay($scope, $http, umbRequestHelper) { + function EmbedOverlay($scope, $http, umbRequestHelper, localizationService) { var vm = this; var origWidth = 500; var origHeight = 300; - $scope.model.title = "Embed"; + if(!$scope.model.title) { + $scope.model.title = localizationService.localize("general_embed").then(function (value) {return value;}); + } + $scope.model.embed = { url: "", width: 360, diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/help/help.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/help/help.controller.js index 13b2f4edb6..8d88150368 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/help/help.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/help/help.controller.js @@ -2,9 +2,12 @@ angular.module("umbraco") .controller("Umbraco.Overlays.HelpController", function ($scope, $location, $routeParams, helpService, userService, localizationService) { $scope.section = $routeParams.section; $scope.version = Umbraco.Sys.ServerVariables.application.version + " assembly: " + Umbraco.Sys.ServerVariables.application.assemblyVersion; - $scope.model.title = "Help"; $scope.model.subtitle = "Umbraco version" + " " + $scope.version; + if(!$scope.model.title) { + $scope.model.title = localizationService.localize("general_help").then(function (value) {return value;}); + } + if(!$scope.section){ $scope.section = "content"; } @@ -19,11 +22,6 @@ angular.module("umbraco") $scope.sectionName = value; }); - // translate dialog title - localizationService.localize("sections_help").then(function (value) { - $scope.model.title = value; - }); - userService.getCurrentUser().then(function(user){ rq.usertype = user.userType; diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.controller.js index 9d01c0d579..8cd58dda5e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.controller.js @@ -6,14 +6,16 @@ * @description * The controller for the content type editor property dialog */ -function IconPickerOverlay($scope, iconHelper) { +function IconPickerOverlay($scope, iconHelper, localizationService) { $scope.loading = true; $scope.model.hideSubmitButton = true; - if(!$scope.model.title) { - $scope.model.title = "Select an icon"; - } + if (!$scope.model.title) { + $scope.model.title = localizationService.localize("defaultdialogs_selectIcon").then(function(value) { + return value; + }); + } iconHelper.getIcons().then(function(icons) { $scope.icons = icons; diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js index db858db679..fdb687e5f4 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js @@ -1,11 +1,17 @@ -function ItemPickerOverlay($scope) { +function ItemPickerOverlay($scope, localizationService) { - $scope.model.hideSubmitButton = true; + if (!$scope.model.title) { + $scope.model.title = localizationService.localize("defaultdialogs_selectItem").then(function(value) { + return value; + }); + } - $scope.selectItem = function(item) { - $scope.model.selectedItem = item; - $scope.submitForm($scope.model); - }; + $scope.model.hideSubmitButton = true; + + $scope.selectItem = function(item) { + $scope.model.selectedItem = item; + $scope.submitForm($scope.model); + }; } diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js index 7458f04011..59e97566c8 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js @@ -8,9 +8,9 @@ angular.module("umbraco").controller("Umbraco.Overlays.LinkPickerController", searchText = value + "..."; }); - if(!$scope.model.title) { - $scope.model.title = "Link picker"; - } + if(!$scope.model.title) { + $scope.model.title = localizationService.localize("defaultdialogs_selectLink").then(function (value) {return value;}); + } $scope.dialogTreeEventHandler = $({}); $scope.model.target = {}; diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/macropicker/macropicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/macropicker/macropicker.controller.js index 8fef90b607..6ab02fecbc 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/macropicker/macropicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/macropicker/macropicker.controller.js @@ -1,7 +1,10 @@ -function MacroPickerController($scope, entityResource, macroResource, umbPropEditorHelper, macroService, formHelper) { +function MacroPickerController($scope, entityResource, macroResource, umbPropEditorHelper, macroService, formHelper, localizationService) { - $scope.model.title = "Macro picker"; + if(!$scope.model.title) { + $scope.model.title = localizationService.localize("defaultdialogs_selectMacro").then(function (value) {return value;}); + } + $scope.macros = []; $scope.model.selectedMacro = null; $scope.wizardStep = "macroSelect"; diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js index 4ad796ee11..88b4ed3788 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js @@ -1,7 +1,11 @@ //used for the media picker dialog angular.module("umbraco") .controller("Umbraco.Overlays.MediaPickerController", - function ($scope, mediaResource, umbRequestHelper, entityResource, $log, mediaHelper, eventsService, treeService, $element, $timeout, $cookies, $cookieStore) { + function ($scope, mediaResource, umbRequestHelper, entityResource, $log, mediaHelper, eventsService, treeService, $element, $timeout, $cookies, $cookieStore, localizationService) { + + if(!$scope.model.title) { + $scope.model.title = localizationService.localize("defaultdialogs_selectMedia").then(function (value) {return value;}); + } var dialogOptions = $scope.model; diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/membergrouppicker/membergrouppicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/membergrouppicker/membergrouppicker.controller.js index 4457ac8f90..b38e1c1c59 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/membergrouppicker/membergrouppicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/membergrouppicker/membergrouppicker.controller.js @@ -1,6 +1,10 @@ //used for the member picker dialog angular.module("umbraco").controller("Umbraco.Overlays.MemberGroupPickerController", - function($scope, eventsService, entityResource, searchService, $log) { + function($scope, eventsService, entityResource, searchService, $log, localizationService) { + + if(!$scope.model.title) { + $scope.model.title = localizationService.localize("defaultdialogs_selectMemberGroup").then(function (value) {return value;}); + } $scope.dialogTreeEventHandler = $({}); $scope.multiPicker = $scope.model.multiPicker; diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/move/move.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/move/move.controller.js index abe58b9a02..3324b244d8 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/move/move.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/move/move.controller.js @@ -17,6 +17,10 @@ searchText = value + "..."; }); + if(!$scope.model.title) { + $scope.model.title = localizationService.localize("actions_move").then(function (value) {return value;}); + } + $scope.model.relateToOriginal = true; $scope.dialogTreeEventHandler = $({}); diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js index 2e530235d3..6f5438de24 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js @@ -23,10 +23,19 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", if(contentType === "content") { entityType = "Document"; + if(!$scope.model.title) { + $scope.model.title = localizationService.localize("defaultdialogs_selectContent").then(function (value) {return value;}); + } } else if(contentType === "member") { entityType = "Member"; + if(!$scope.model.title) { + $scope.model.title = localizationService.localize("defaultdialogs_selectMember").then(function (value) {return value;}); + } } else if(contentType === "media") { entityType = "Media"; + if(!$scope.model.title) { + $scope.model.title = localizationService.localize("defaultdialogs_selectMedia").then(function (value) {return value;}); + } } } diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js index d76dac9bdf..544b50ceef 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js @@ -7,6 +7,10 @@ angular.module("umbraco") $scope.changePasswordButtonState = "init"; $scope.model.subtitle = "Umbraco version" + " " + $scope.version; + if(!$scope.model.title) { + $scope.model.title = localizationService.localize("general_user").then(function (value) {return value;}); + } + $scope.externalLoginProviders = externalLoginInfo.providers; $scope.externalLinkLoginFormAction = Umbraco.Sys.ServerVariables.umbracoUrls.externalLinkLoginsUrl; var evts = []; diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.controller.js index 2b07b8830f..a060036765 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.controller.js @@ -1,8 +1,8 @@ angular.module("umbraco") .controller("Umbraco.Overlays.YsodController", function ($scope, legacyResource, treeService, navigationService) { - if (!$scope.model.title) { - $scope.model.title = "Received an error from the server"; + if(!$scope.model.title) { + $scope.model.title = localizationService.localize("errors_receivedErrorFromServer").then(function (value) {return value;}); } if ($scope.model.error && $scope.model.error.data && $scope.model.error.data.StackTrace) { diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index f1a89c0934..8bc6f15836 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -252,7 +252,15 @@ Opens the linked document in the parent frame Link to media - SelectMedia + + Select media + Select icon + Select item + Select link + Select macro + Select content + Select member + Select member group There are no parameters for this macro @@ -265,6 +273,7 @@ account + Select editor List view Saving... current + Move + Embed @@ -1207,4 +1218,7 @@ To manage your website, simply open the Umbraco back office and start adding con Your recent history Session expires in + + Received an error from the server +