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

V8: Add user state and filter localization (#4510)

Browse Source
This commit is contained in:
Kenn Jacobsen
2019-02-14 18:07:09 +01:00
committed by Sebastiaan Janssen
parent 04525b014e
commit f4a0546dba
5 changed files with 53 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;
}
});
});

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

@@ -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) {

11
src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
View File

@@ -1517,6 +1517,17 @@ Mange hilsner fra Umbraco robotten
<key alias="backToUsers">Tilbage til brugere</key>
<key alias="inviteEmailCopySubject">Umbraco: Invitation</key>
<key alias="inviteEmailCopyFormat"><![CDATA[<html><body><p>Hej %0%, du er blevet inviteret af %1% til Umbraco backoffice.</p><p>Besked fra %1%: <em>%2%</em></p><p>Klik på dette <a href="%3%" target="_blank">link</a> for acceptere invitationen</p><p><small>Hvis du ikke kan klikke på linket, så kopier og indsæt denne URL i dit browservindue<br/><br/>%3%</small></p></body></html>]]></key>
<key alias="stateAll">Alle</key>
<key alias="stateActive">Aktiv</key>
<key alias="stateDisabled">Deaktiveret</key>
<key alias="stateLockedOut">Låst ude</key>
<key alias="stateInvited">Inviteret</key>
<key alias="stateInactive">Inaktiv</key>
<key alias="sortNameAscending">Navn (A-Å)</key>
<key alias="sortNameDescending">Navn (Å-A)</key>
<key alias="sortCreateDateAscending">Nyeste</key>
<key alias="sortCreateDateDescending">Ældste</key>
<key alias="sortLastLoginDateDescending">Sidst logget ind</key>
</area>
<area alias="validation">
<key alias="validation">Validering</key>

11
src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
View File

@@ -1922,6 +1922,17 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="defaultInvitationMessage">Resending invitation...</key>
<key alias="deleteUser">Delete User</key>
<key alias="deleteUserConfirmation">Are you sure you wish to delete this user account?</key>
<key alias="stateAll">All</key>
<key alias="stateActive">Active</key>
<key alias="stateDisabled">Disabled</key>
<key alias="stateLockedOut">Locked out</key>
<key alias="stateInvited">Invited</key>
<key alias="stateInactive">Inactive</key>
<key alias="sortNameAscending">Name (A-Z)</key>
<key alias="sortNameDescending">Name (Z-A)</key>
<key alias="sortCreateDateAscending">Newest</key>
<key alias="sortCreateDateDescending">Oldest</key>
<key alias="sortLastLoginDateDescending">Last login</key>
</area>
<area alias="validation">
<key alias="validation">Validation</key>

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

@@ -1931,6 +1931,17 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="defaultInvitationMessage">Resending invitation...</key>
<key alias="deleteUser">Delete User</key>
<key alias="deleteUserConfirmation">Are you sure you wish to delete this user account?</key>
<key alias="stateAll">All</key>
<key alias="stateActive">Active</key>
<key alias="stateDisabled">Disabled</key>
<key alias="stateLockedOut">Locked out</key>
<key alias="stateInvited">Invited</key>
<key alias="stateInactive">Inactive</key>
<key alias="sortNameAscending">Name (A-Z)</key>
<key alias="sortNameDescending">Name (Z-A)</key>
<key alias="sortCreateDateAscending">Newest</key>
<key alias="sortCreateDateDescending">Oldest</key>
<key alias="sortLastLoginDateDescending">Last login</key>
</area>
<area alias="validation">
<key alias="validation">Validation</key>