diff --git a/src/Umbraco.Web.UI.Client/src/common/services/usershelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/usershelper.service.js
index dc0c4fe160..21fe84ff8d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/usershelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/usershelper.service.js
@@ -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) {
diff --git a/src/Umbraco.Web.UI.Client/src/less/navs.less b/src/Umbraco.Web.UI.Client/src/less/navs.less
index da0dfc0110..c6fd3dde01 100644
--- a/src/Umbraco.Web.UI.Client/src/less/navs.less
+++ b/src/Umbraco.Web.UI.Client/src/less/navs.less
@@ -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;
}
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
index e89771f941..95d62619a9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
@@ -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';
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
index 87871bdea0..23895db95b 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
@@ -1469,6 +1469,17 @@ Mange hilsner fra Umbraco robotten
Sæt rettigheder for specifikke noder
Profil
Søg alle 'børn'
+ Start node
+ Aktiv
+ Alle
+ Deaktiveret
+ Låst ude
+ Inviteret
+ Navn (A-Å)
+ Navn (Å-A)
+ Nyeste
+ Ældste
+ Senest login
Tilføj sektioner for at give brugerne adgang
Vælg brugergrupper
Ingen startnode valgt
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index 87793ce694..30ebc137b9 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -1679,10 +1679,20 @@ To manage your website, simply open the Umbraco back office and start adding con
Select user groups
No start node selected
No start nodes selected
+ Active
+ All
+ Disabled
+ Locked out
+ Invited
Content start node
Limit the content tree to a specific start node
Content start nodes
Limit the content tree to specific start nodes
+ Name (A-Z)
+ Name (Z-A)
+ Newest
+ Oldest
+ Last login
User last updated
has been created
The new user has successfully been created. To log in to Umbraco use the password below.
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
index 5869f92407..93a0582c92 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
@@ -1672,10 +1672,20 @@ To manage your website, simply open the Umbraco back office and start adding con
Select user groups
No start node selected
No start nodes selected
+ Active
+ All
+ Disabled
+ Locked out
+ Invited
Content start node
Limit the content tree to a specific start node
Content start nodes
Limit the content tree to specific start nodes
+ Name (A-Z)
+ Name (Z-A)
+ Newest
+ Oldest
+ Last login
User last updated
has been created
The new user has successfully been created. To log in to Umbraco use the password below.