Merge pull request #2210 from bjarnef/dev-v7-U4-10442

U4-10442 - Localization of users section
This commit is contained in:
negyven6
2017-09-28 15:18:15 +02:00
committed by GitHub
10 changed files with 367 additions and 123 deletions

View File

@@ -15,7 +15,7 @@
//note on the below, we dont assign a view unless it's the right route since if we did that it will load in that controller
//for the view which is unecessary and will cause extra overhead/requests to occur
vm.page = {};
vm.page.name = "User Management";
vm.page.name = localizationService.localize("user_userManagement");
vm.page.navigation = [
{
"name": localizationService.localize("sections_users"),

View File

@@ -53,6 +53,7 @@
<umb-button
type="button"
label="Delete"
label-key="general_delete"
icon="icon-trash"
action="vm.deleteUserGroups()"
size="xs">

View File

@@ -284,10 +284,10 @@
vm.selectedBulkUserGroups = _.clone(firstSelectedUser.userGroups);
vm.userGroupPicker = {
title: "Select user groups",
title: localizationService.localize("user_selectUserGroups"),
view: "usergrouppicker",
selection: vm.selectedBulkUserGroups,
closeButtonLabel: "Cancel",
closeButtonLabel: localizationService.localize("general_cancel"),
show: true,
submit: function (model) {
usersResource.setUserGroupsOnUsers(model.selection, vm.selection).then(function (data) {
@@ -320,10 +320,10 @@
function openUserGroupPicker(event) {
vm.userGroupPicker = {
title: "Select user groups",
title: localizationService.localize("user_selectUserGroups"),
view: "usergrouppicker",
selection: vm.newUser.userGroups,
closeButtonLabel: "Cancel",
closeButtonLabel: localizationService.localize("general_cancel"),
show: true,
submit: function (model) {
// apply changes