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 afcd3b27ff..1bda86c3b3 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
@@ -12,14 +12,14 @@
{ "value": 4, "name": "Inactive", "key": "Inactive", "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) {
+ localizationService.localizeMany(_.map(userStates, function (userState) {
+ return "user_state" + userState.key;
+ })).then(function (data) {
+ var reg = /^\[[\S\s]*]$/g;
+ _.each(data, function (value, index) {
+ if (!reg.test(value)) {
// Only translate if key exists
- userState.name = value;
+ userStates[index].name = value;
}
});
});
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 38f6758651..941d72b8c9 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
@@ -21,18 +21,23 @@
{ 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) {
+ localizationService.localizeMany(_.map(vm.userSortData, function (userSort) {
+ return "user_sort" + userSort.key + userSort.direction;
+ })).then(function (data) {
+ var reg = /^\[[\S\s]*]$/g;
+ _.each(data, function (value, index) {
+ if (!reg.test(value)) {
// Only translate if key exists
- userSortData.label = value;
+ vm.userSortData[index].label = value;
}
});
});
+ vm.labels = {};
+ localizationService.localizeMany(["user_stateAll"]).then(function (data) {
+ vm.labels.all = data[0];
+ });
+
vm.userStatesFilter = [];
vm.newUser.userGroups = [];
vm.usersViewState = 'overview';
@@ -388,7 +393,7 @@
}
function getFilterName(array) {
- var name = "All";
+ var name = vm.labels.all;
var found = false;
angular.forEach(array, function (item) {
if (item.selected) {
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index 0cfd4b44cf..b078a42d1b 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -1517,6 +1517,17 @@ Mange hilsner fra Umbraco robotten
Tilbage til brugere
Umbraco: Invitation
Hej %0%, du er blevet inviteret af %1% til Umbraco backoffice.
Besked fra %1%: %2%
Klik på dette link for acceptere invitationen
Hvis du ikke kan klikke på linket, så kopier og indsæt denne URL i dit browservindue
%3%