yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2100 from umbraco/temp-U4-10059

Browse Source 
U4-10059 Localize users and user groups
This commit is contained in:
Shannon Deminick
2017-08-09 19:35:40 +10:00
committed by GitHub
parent fc8c750fb0 60ffd20e20
commit 41e555881f
5 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/src/common/directives/components/users/umbusergrouppreview.directive.js
View File

@@ -17,7 +17,9 @@
description: "=?",
sections: "=?",
contentStartNode: "=?",
hideContentStartNode: "@?",
mediaStartNode: "=?",
hideMediaStartNode: "@?",
permissions: "=?",
allowRemove: "=?",
allowEdit: "=?",

4
src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-group-preview.html
View File

@@ -13,7 +13,7 @@
</span>
</div>
<div class="umb-user-group-preview__permission">
<div class="umb-user-group-preview__permission" ng-if="!hideContentStartNode">
<span>
<span class="bold"><localize key="user_startnode">Content start node</localize>:</span>
<span ng-if="!contentStartNode"><localize key="user_noStartNode">No start node selected</localize></span>
@@ -21,7 +21,7 @@
</span>
</div>
<div class="umb-user-group-preview__permission">
<div class="umb-user-group-preview__permission" ng-if="!hideMediaStartNode">
<span>
<span class="bold"><localize key="user_mediastartnode">Media start node</localize>:</span>
<span ng-if="!mediaStartNode"><localize key="user_noStartNode">No start node selected</localize></span>

6
src/Umbraco.Web.UI.Client/src/views/content/content.rights.controller.js
View File

@@ -1,7 +1,7 @@
(function () {
"use strict";
function ContentRightsController($scope, contentResource) {
function ContentRightsController($scope, contentResource, localizationService) {
var vm = this;
@@ -9,6 +9,7 @@
vm.selectedUserGroups = [];
vm.removedUserGroups = [];
vm.viewState = "manageGroups";
vm.labels = {};
vm.setViewSate = setViewSate;
vm.editPermissions = editPermissions;
@@ -51,6 +52,9 @@
//if no permissions are explicitly set this means we need to show the defaults
vm.selectedUserGroup.permissions = vm.selectedUserGroup.defaultPermissions;
}
localizationService.localize("defaultdialogs_permissionsSetForGroup", [$scope.currentNode.name, vm.selectedUserGroup.name]).then(function (value) {
vm.labels.permissionsSetForGroup = value;
});
setViewSate("managePermissions");
}

17
src/Umbraco.Web.UI.Client/src/views/content/rights.html
View File

@@ -14,18 +14,20 @@
<div ng-show="vm.saveSuccces">
<div class="alert alert-success">
Permissions saved for <strong>{{currentNode.name}}</strong>
<localize key="speechBubbles_permissionsSavedFor"></localize><strong> {{currentNode.name}}</strong>
</div>
</div>
<h5>Ut tempor dui nec consectetur efficitur.</h5>
<p class="abstract" style="margin-bottom: 20px;">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam tellus purus, malesuada sed purus ut, semper sollicitudin odio.</p>
<h5><localize key="defaultdialogs_permissionsSet">Set permissions for</localize> {{ currentNode.name }}</h5>
<p class="abstract" style="margin-bottom: 20px;"><localize key="defaultdialogs_permissionsHelp"></localize></p>
<div style="position: relative; display: inline-block; margin-bottom: 20px;">
<a class="btn btn-info dropdown-toggle" data-toggle="dropdown" href="#">
Add permissions for...
<localize key="defaultdialogs_permissionsSet">Set permissions for</localize>...
<span class="caret" style="margin-left: 10px;"></span>
</a>
<ul class="dropdown-menu">
<li ng-repeat="group in vm.availableUserGroups | filter:{selected: '!true'}">
<a href="" ng-click="vm.editPermissions(group)" prevent-default>
@@ -41,6 +43,8 @@
ng-repeat="group in vm.selectedUserGroups"
icon="group.icon"
name="group.name"
hide-content-start-node="true"
hide-media-start-node="true"
permissions="group.allowedPermissions"
allow-remove="true"
allow-edit="true"
@@ -78,8 +82,7 @@
<div class="umb-dialog-body" ng-cloak>
<div class="umb-pane block-form">
<h5>Set permissions for {{ vm.selectedUserGroup.name }}</h5>
<p class="abstract" style="margin-bottom: 20px;">Nam tellus purus, malesuada sed purus ut, semper sollicitudin odio.</p>
<h5>{{ vm.labels.permissionsSetForGroup }}</h5>
<umb-control-group
ng-repeat="(category, permissions) in vm.selectedUserGroup.permissions"
label="{{category}}">
@@ -103,7 +106,7 @@
</umb-button>
<umb-button
label="Set permissions"
label-key="actions_setPermissions"
action="vm.setPermissions(vm.selectedUserGroup)"
type="button"
button-style="success">

7
src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
View File

@@ -41,6 +41,7 @@
<key alias="sort">Sort</key>
<key alias="translate">Translate</key>
<key alias="update">Update</key>
<key alias="setPermissions">Set permissions</key>
</area>
<area alias="actionCategories">
<key alias="content">Content</key>
@@ -308,7 +309,10 @@
<key alias="macroContainerSettings">Macro Settings</key>
<key alias="macroDoesNotHaveProperties">This macro does not contain any properties you can edit</key>
<key alias="paste">Paste</key>
<key alias="permissionsEdit">Edit Permissions for</key>
<key alias="permissionsEdit">Edit permissions for</key>
<key alias="permissionsSet">Set permissions for</key>
<key alias="permissionsSetForGroup">Set permissions for %0% for user group %1%</key>
<key alias="permissionsHelp">Select the users groups you want to set permissions for</key>
<key alias="recycleBinDeleting">The items in the recycle bin are now being deleted. Please do not close this window while this operation takes place</key>
<key alias="recycleBinIsEmpty">The recycle bin is now empty</key>
<key alias="recycleBinWarning">When items are deleted from the recycle bin, they will be gone forever</key>
@@ -1128,6 +1132,7 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="partialViewSavedText">Partial view saved without any errors!</key>
<key alias="partialViewErrorHeader">Partial view not saved</key>
<key alias="partialViewErrorText">An error occurred saving the file.</key>
<key alias="permissionsSavedFor">Permissions saved for</key>
<key alias="scriptSavedHeader">Script view saved</key>
<key alias="scriptSavedText">Script view saved without any errors!</key>
<key alias="scriptErrorHeader">Script view not saved</key>