diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/usergrouppicker/usergrouppicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/usergrouppicker/usergrouppicker.controller.js index 8537ec6835..bd663a6a9c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/usergrouppicker/usergrouppicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/usergrouppicker/usergrouppicker.controller.js @@ -16,6 +16,11 @@ vm.loading = true; + // set default title + if(!$scope.model.title) { + $scope.model.title = localizationService.localize("defaultdialogs_selectUsers"); + } + // make sure we can push to something if(!$scope.model.selection) { $scope.model.selection = []; 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 e0a3f08b4b..cc95c6f0fb 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 @@ -4,7 +4,6 @@ function UserEditController($scope, $timeout, $location, $routeParams, formHelper, usersResource, contentEditingHelper, localizationService, notificationsService, mediaHelper, Upload, umbRequestHelper, usersHelper, authResource) { var vm = this; - var localizeSaving = localizationService.localize("general_saving"); vm.page = {}; vm.user = { @@ -12,6 +11,7 @@ }; vm.breadcrumbs = []; vm.avatarFile = {}; + vm.labels = {}; vm.goToPage = goToPage; vm.openUserGroupPicker = openUserGroupPicker; @@ -37,6 +37,22 @@ vm.loading = true; + var labelKeys = [ + "general_saving", + "general_cancel", + "defaultdialogs_selectContentStartNode", + "defaultdialogs_selectMediaStartNode", + "sections_users" + ]; + + localizationService.localizeMany(labelKeys).then(function (values) { + vm.labels.saving = values[0]; + vm.labels.cancel = values[1]; + vm.labels.selectContentStartNode = values[2]; + vm.labels.selectMediaStartNode = values[3]; + vm.labels.users = values[4]; + }); + // get user usersResource.getUser($routeParams.id).then(function (user) { vm.user = user; @@ -71,7 +87,7 @@ vm.user.resetPasswordValue = null; contentEditingHelper.contentEditorPerformSave({ - statusMessage: localizeSaving, + statusMessage: vm.labels.saving, saveMethod: usersResource.saveUser, scope: $scope, content: vm.user, @@ -101,10 +117,9 @@ function openUserGroupPicker() { vm.userGroupPicker = { - title: "Select user groups", view: "usergrouppicker", selection: vm.user.userGroups, - closeButtonLabel: "Cancel", + closeButtonLabel: vm.labels.cancel, show: true, submit: function (model) { // apply changes @@ -127,7 +142,7 @@ function openContentPicker() { vm.contentPicker = { - title: "Select content start node", + title: vm.labels.selectContentStartNode, view: "contentpicker", multiPicker: true, selection: vm.user.startContentIds, @@ -158,7 +173,7 @@ function openMediaPicker() { vm.mediaPicker = { - title: "Select media start node", + title: vm.labels.selectMediaStartNode, view: "treepicker", section: "media", treeAlias: "media", @@ -311,7 +326,7 @@ function makeBreadcrumbs() { vm.breadcrumbs = [ { - "name": "Users", + "name": vm.labels.users, "path": "/users/users/overview", "subView": "users" },