From a63d0a2fb349b9e41be2bb5a173dc4157dbe08e7 Mon Sep 17 00:00:00 2001
From: Lorenzo Natali <lorenzo.natali@geo-solutions.it>
Date: Fri, 25 Nov 2016 10:22:36 +0100
Subject: [PATCH] Fix #1294. Fixed labels for usergroup manager

---
 web/client/components/manager/users/GroupGrid.jsx | 4 ++--
 web/client/plugins/manager/users/TopButtons.jsx   | 2 +-
 web/client/translations/data.de-DE                | 3 +++
 web/client/translations/data.en-US                | 3 +++
 web/client/translations/data.fr-FR                | 3 +++
 web/client/translations/data.it-IT                | 8 +++++---
 6 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/web/client/components/manager/users/GroupGrid.jsx b/web/client/components/manager/users/GroupGrid.jsx
index 15feba7930..f21e0707cd 100644
--- a/web/client/components/manager/users/GroupGrid.jsx
+++ b/web/client/components/manager/users/GroupGrid.jsx
@@ -69,11 +69,11 @@ var GroupsGrid = React.createClass({
             let actions = [{
                      onClick: () => {this.props.onEdit(group); },
                      glyph: "wrench",
-                     tooltip: <Message msgId="users.editUser" />
+                     tooltip: <Message msgId="usergroups.editGroup" />
              }, {
                      onClick: () => {this.props.onDelete(group && group.id); },
                      glyph: "remove-circle",
-                     tooltip: <Message msgId="users.deleteUser" />
+                     tooltip: <Message msgId="usergroups.deleteGroup" />
              }];
             if ( group && group.groupName === "everyone") {
                 actions = [];
diff --git a/web/client/plugins/manager/users/TopButtons.jsx b/web/client/plugins/manager/users/TopButtons.jsx
index 205ec1bf3f..c70020d036 100644
--- a/web/client/plugins/manager/users/TopButtons.jsx
+++ b/web/client/plugins/manager/users/TopButtons.jsx
@@ -47,7 +47,7 @@ const Bar = React.createClass({
         if (this.props.selectedTool === (USERS)) {
             return <span><Glyphicon glyph="1-group" /><Message msgId="usergroups.manageGroups" /></span>;
         } else if (this.props.selectedTool === GROUPS) {
-            return <span><Glyphicon glyph="user" /><Message msgId="users.title" /></span>;
+            return <span><Glyphicon glyph="user" /><Message msgId="users.manageUsers" /></span>;
         }
     },
     renderTitle() {
diff --git a/web/client/translations/data.de-DE b/web/client/translations/data.de-DE
index 04f57878eb..d75ada19e8 100644
--- a/web/client/translations/data.de-DE
+++ b/web/client/translations/data.de-DE
@@ -452,6 +452,7 @@
         "users": {
             "title": "Manage Accounts",
             "users": "Users",
+            "manageUsers": "Manage Users",
             "searchUsers": "search for users...",
             "newUser": "New User",
             "editUser": "Edit user",
@@ -476,6 +477,8 @@
         "usergroups": {
           "searchGroups": "Search Groups...",
           "groups": "Groups",
+          "editGroup": "Edit Group",
+          "deleteGroup": "Delete Group",
           "removeUser": "Remove User",
           "newGroup": "New Group",
           "manageGroups": "Manage Groups",
diff --git a/web/client/translations/data.en-US b/web/client/translations/data.en-US
index ce6a0c48c4..b1a816ede2 100644
--- a/web/client/translations/data.en-US
+++ b/web/client/translations/data.en-US
@@ -452,6 +452,7 @@
         "users": {
             "title": "Manage Accounts",
             "users": "Users",
+            "manageUsers": "Manage Users",
             "searchUsers": "search for users...",
             "newUser": "New User",
             "editUser": "Edit user",
@@ -476,6 +477,8 @@
         "usergroups": {
           "searchGroups": "Search Groups...",
           "groups": "Groups",
+          "editGroup": "Edit Group",
+          "deleteGroup": "Delete Group",
           "removeUser": "Remove User",
           "newGroup": "New Group",
           "manageGroups": "Manage Groups",
diff --git a/web/client/translations/data.fr-FR b/web/client/translations/data.fr-FR
index 8126d4307a..8153a1a8d7 100644
--- a/web/client/translations/data.fr-FR
+++ b/web/client/translations/data.fr-FR
@@ -454,6 +454,7 @@
         "users": {
             "title": "Gérer les comptes",
             "users": "Utilisateurs",
+            "manageUsers": "Gérer les utilisateurs",
             "searchUsers": "rechercher des utilisateurs ...",
             "newUser": "Nouvel",
             "editUser": "Modifier",
@@ -478,6 +479,8 @@
         "usergroups": {
           "searchGroups": "rechercher des groupes...",
           "groups": "Groupes",
+          "editGroup": "Modifier",
+          "deleteGroup": "Supprimer",
           "removeUser": "supprimer l'utilisateur",
           "newGroup": "Nouveau groupe",
           "manageGroups": "Gérer les groupes",
diff --git a/web/client/translations/data.it-IT b/web/client/translations/data.it-IT
index 028cf52773..9f479eceed 100644
--- a/web/client/translations/data.it-IT
+++ b/web/client/translations/data.it-IT
@@ -450,9 +450,9 @@
             }
         },
         "users": {
-
-            "title": "Gestione utenti",
+            "title": "Gestione Account",
             "users": "Utenti",
+            "manageUsers": "Gestisci utenti",
             "searchUsers": "Cerca utenti...",
             "newUser": "Nuovo utente",
             "editUser": "Modifica utente",
@@ -475,8 +475,10 @@
             "selectedGroups": "GRUPPI SELEZIONATI"
         },
         "usergroups": {
-          "searchGroups": "Cerca Gruppi...",
+          "searchGroups": "Cerca gruppi...",
           "groups": "Gruppi",
+          "editGroup": "Modifica Gruppo",
+          "deleteGroup": "Rimuovi Gruppo",
           "removeUser": "Rimuovi Utente",
           "newGroup": "Nuovo Gruppo",
           "manageGroups": "Gestisci Gruppi",