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

Merge pull request #2213 from bjarnef/dev-v7-U4-10462

Browse Source 
U4-10462 - Localize dropdown filters
This commit is contained in:
Zsolt
2017-09-29 09:28:42 +02:00
committed by GitHub
parent efd1ea5b86 e0801cd05a
commit 828a94bc4f
6 changed files with 61 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Umbraco.Web.UI.Client/src/common/services/usershelper.service.js
View File

@@ -11,6 +11,18 @@
{ "value": 3, "name": "Invited", "key": "Invited", "color": "warning" }
];
angular.forEach(userStates, function (userState) {
var key = "user_state" + userState.key;
localizationService.localize(key).then(function (value) {
var reg = /^\[[\S\s]*]$/g;
var result = reg.test(value);
if (result === false) {
// Only translate if key exists
userState.name = value;
}
});
});
function getUserStateFromValue(value) {
var foundUserState;
angular.forEach(userStates, function (userState) {

5
src/Umbraco.Web.UI.Client/src/less/navs.less
View File

@@ -249,6 +249,11 @@
border-radius: 0;
}
// fix dropdown with checkbox + long text in label
.dropdown-menu > li > .flex > label {
flex: 1 1 0;
}
.dropdown-menu > li > a {
padding: 8px 20px;
}

13
src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
View File

@@ -20,6 +20,19 @@
{ label: "Oldest", key: "CreateDate", direction: "Ascending" },
{ label: "Last login", key: "LastLoginDate", direction: "Descending" }
];
angular.forEach(vm.userSortData, function (userSortData) {
var key = "user_sort" + userSortData.key + userSortData.direction;
localizationService.localize(key).then(function (value) {
var reg = /^\[[\S\s]*]$/g;
var result = reg.test(value);
if (result === false) {
// Only translate if key exists
userSortData.label = value;
}
});
});
vm.userStatesFilter = [];
vm.newUser.userGroups = [];
vm.usersViewState = 'overview';