From fa777c46b160fe18677d8ad6a667820b2755f607 Mon Sep 17 00:00:00 2001 From: Bjarne Fyrstenborg Date: Sun, 24 Sep 2017 21:43:23 +0200 Subject: [PATCH 1/3] Localize user filters --- .../src/common/services/usershelper.service.js | 12 ++++++++++++ .../src/views/users/views/users/users.controller.js | 13 +++++++++++++ src/Umbraco.Web.UI/umbraco/config/lang/da.xml | 10 ++++++++++ src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 10 ++++++++++ src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml | 10 ++++++++++ 5 files changed, 55 insertions(+) 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/views/users/views/users/users.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js index 96ebf4f07b..2d65c65d22 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 042e96fc98..80eb941e13 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml @@ -1262,6 +1262,16 @@ Mange hilsner fra Umbraco robotten Profil Søg alle 'børn' Start node + Aktiv + Alle + Deaktiveret + Låst ude + Inviteret + Navn (A-Å) + Navn (Å-A) + Nyeste + Ældste + Senest login Navn Brugertilladelser Forfatter diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index 49d120bf78..5b838b59ca 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -1678,10 +1678,20 @@ To manage your website, simply open the Umbraco back office and start adding con Add sections to give users access 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 5924256c4d..61f0304fe2 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml @@ -1671,10 +1671,20 @@ To manage your website, simply open the Umbraco back office and start adding con Add sections to give users access 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. From 30f42f4ea89e028606fb2922f2387cd5949a8215 Mon Sep 17 00:00:00 2001 From: Bjarne Fyrstenborg Date: Sun, 24 Sep 2017 21:57:05 +0200 Subject: [PATCH 2/3] Fix dropdown issue with checkbox because of long label text --- src/Umbraco.Web.UI.Client/src/less/navs.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/src/less/navs.less b/src/Umbraco.Web.UI.Client/src/less/navs.less index da0dfc0110..e029ec3074 100644 --- a/src/Umbraco.Web.UI.Client/src/less/navs.less +++ b/src/Umbraco.Web.UI.Client/src/less/navs.less @@ -249,6 +249,10 @@ border-radius: 0; } +.dropdown-menu > li > .flex > label { + flex: 1 1 0; +} + .dropdown-menu > li > a { padding: 8px 20px; } From fc46569cd90ff346709e01e1c6b1e5f05865185b Mon Sep 17 00:00:00 2001 From: Bjarne Fyrstenborg Date: Sun, 24 Sep 2017 22:11:12 +0200 Subject: [PATCH 3/3] Add comment --- src/Umbraco.Web.UI.Client/src/less/navs.less | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Umbraco.Web.UI.Client/src/less/navs.less b/src/Umbraco.Web.UI.Client/src/less/navs.less index e029ec3074..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,7 @@ border-radius: 0; } +// fix dropdown with checkbox + long text in label .dropdown-menu > li > .flex > label { flex: 1 1 0; }