Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #1294. Fixed labels for usergroup manager #1295

Merged
merged 1 commit into from
Nov 25, 2016
Merged

Fix #1294. Fixed labels for usergroup manager #1295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions web/client/components/manager/users/GroupGrid.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [];
Expand Down
2 changes: 1 addition & 1 deletion web/client/plugins/manager/users/TopButtons.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
3 changes: 3 additions & 0 deletions web/client/translations/data.de-DE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,6 +452,7 @@
"users": {
"title": "Manage Accounts",
"users": "Users",
"manageUsers": "Manage Users",
"searchUsers": "search for users...",
"newUser": "New User",
"editUser": "Edit user",
Expand All @@ -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",
Expand Down
3 changes: 3 additions & 0 deletions web/client/translations/data.en-US
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,6 +452,7 @@
"users": {
"title": "Manage Accounts",
"users": "Users",
"manageUsers": "Manage Users",
"searchUsers": "search for users...",
"newUser": "New User",
"editUser": "Edit user",
Expand All @@ -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",
Expand Down
3 changes: 3 additions & 0 deletions web/client/translations/data.fr-FR
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
8 changes: 5 additions & 3 deletions web/client/translations/data.it-IT
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down