diff options
Diffstat (limited to 'web/react')
-rw-r--r-- | web/react/components/channel_invite_modal.jsx | 2 | ||||
-rw-r--r-- | web/react/components/channel_members_modal.jsx | 2 | ||||
-rw-r--r-- | web/react/components/filtered_user_list.jsx | 8 | ||||
-rw-r--r-- | web/react/components/team_members_dropdown.jsx | 24 | ||||
-rw-r--r-- | web/react/components/user_list.jsx | 2 |
5 files changed, 19 insertions, 19 deletions
diff --git a/web/react/components/channel_invite_modal.jsx b/web/react/components/channel_invite_modal.jsx index f27f5a900..f0c8a9030 100644 --- a/web/react/components/channel_invite_modal.jsx +++ b/web/react/components/channel_invite_modal.jsx @@ -136,7 +136,7 @@ export default class ChannelInviteModal extends React.Component { > <i className='glyphicon glyphicon-envelope'/> <FormattedMessage - id='member_item.add' + id='channel_invite.add' defaultMessage=' Add' /> </a> diff --git a/web/react/components/channel_members_modal.jsx b/web/react/components/channel_members_modal.jsx index 44de0266b..9c40d93e0 100644 --- a/web/react/components/channel_members_modal.jsx +++ b/web/react/components/channel_members_modal.jsx @@ -141,7 +141,7 @@ export default class ChannelMembersModal extends React.Component { onClick={this.handleRemove.bind(this, user)} > <FormattedMessage - id='member_item.removeMember' + id='channel_members_modal.remove' defaultMessage='Remove Member' /> </button> diff --git a/web/react/components/filtered_user_list.jsx b/web/react/components/filtered_user_list.jsx index dc8abd4c1..67e75af47 100644 --- a/web/react/components/filtered_user_list.jsx +++ b/web/react/components/filtered_user_list.jsx @@ -7,11 +7,11 @@ import {intlShape, injectIntl, defineMessages, FormattedMessage} from 'mm-intl'; const holders = defineMessages({ member: { - id: 'more_direct_channels.member', + id: 'filtered_user_list.member', defaultMessage: 'Member' }, search: { - id: 'more_direct_channels.search', + id: 'filtered_user_list.search', defaultMessage: 'Search members' } }); @@ -64,7 +64,7 @@ class FilteredUserList extends React.Component { if (users.length === this.props.users.length) { count = ( <FormattedMessage - id='more_direct_channels.count' + id='filtered_user_list.count' defaultMessage='{count} {member}' values={{ count: users.length, @@ -75,7 +75,7 @@ class FilteredUserList extends React.Component { } else { count = ( <FormattedMessage - id='more_direct_channels.countTotal' + id='filtered_user_list.countTotal' defaultMessage='{count} {member} of {total} Total' values={{ count: users.length, diff --git a/web/react/components/team_members_dropdown.jsx b/web/react/components/team_members_dropdown.jsx index 35ec66519..7a298d26a 100644 --- a/web/react/components/team_members_dropdown.jsx +++ b/web/react/components/team_members_dropdown.jsx @@ -140,7 +140,7 @@ export default class TeamMembersDropdown extends React.Component { const user = this.props.user; let currentRoles = ( <FormattedMessage - id='member_team_item.member' + id='team_members_dropdown.member' defaultMessage='Member' /> ); @@ -149,14 +149,14 @@ export default class TeamMembersDropdown extends React.Component { if (Utils.isSystemAdmin(user.roles)) { currentRoles = ( <FormattedMessage - id='member_team_item.systemAdmin' + id='team_members_dropdown.systemAdmin' defaultMessage='System Admin' /> ); } else if (Utils.isAdmin(user.roles)) { currentRoles = ( <FormattedMessage - id='member_team_item.teamAdmin' + id='team_members_dropdown.teamAdmin' defaultMessage='Team Admin' /> ); @@ -173,7 +173,7 @@ export default class TeamMembersDropdown extends React.Component { if (user.delete_at > 0) { currentRoles = ( <FormattedMessage - id='member_team_item.inactive' + id='team_members_dropdown.inactive' defaultMessage='Inactive' /> ); @@ -193,7 +193,7 @@ export default class TeamMembersDropdown extends React.Component { onClick={this.handleMakeAdmin} > <FormattedMessage - id='member_team_item.makeAdmin' + id='team_members_dropdown.makeAdmin' defaultMessage='Make Team Admin' /> </a> @@ -211,7 +211,7 @@ export default class TeamMembersDropdown extends React.Component { onClick={this.handleMakeMember} > <FormattedMessage - id='member_team_item.makeMember' + id='team_members_dropdown.makeMember' defaultMessage='Make Member' /> </a> @@ -229,7 +229,7 @@ export default class TeamMembersDropdown extends React.Component { onClick={this.handleMakeActive} > <FormattedMessage - id='member_team_item.makeActive' + id='team_members_dropdown.makeActive' defaultMessage='Make Active' /> </a> @@ -247,7 +247,7 @@ export default class TeamMembersDropdown extends React.Component { onClick={this.handleMakeNotActive} > <FormattedMessage - id='member_team_item.makeInactive' + id='team_members_dropdown.makeInactive' defaultMessage='Make Inactive' /> </a> @@ -259,20 +259,20 @@ export default class TeamMembersDropdown extends React.Component { if (this.props.user.id === me.id) { const title = ( <FormattedMessage - id='member_team_item.confirmDemoteRoleTitle' + id='team_members_dropdown.confirmDemoteRoleTitle' defaultMessage='Confirm demotion from System Admin role' /> ); const message = ( <div> <FormattedMessage - id='member_team_item.confirmDemoteDescription' + id='team_members_dropdown.confirmDemoteDescription' defaultMessage="If you demote yourself from the System Admin role and there is not another user with System Admin privileges, you'll need to re-assign a System Admin by accessing the Mattermost server through a terminal and running the following command." /> <br/> <br/> <FormattedMessage - id='member_team_item.confirmDemotionCmd' + id='team_members_dropdown.confirmDemotionCmd' defaultMessage='platform -assign_role -team_name="yourteam" -email="name@yourcompany.com" -role="system_admin"' /> {serverError} @@ -281,7 +281,7 @@ export default class TeamMembersDropdown extends React.Component { const confirmButton = ( <FormattedMessage - id='member_team_item.confirmDemotion' + id='team_members_dropdown.confirmDemotion' defaultMessage='Confirm Demotion' /> ); diff --git a/web/react/components/user_list.jsx b/web/react/components/user_list.jsx index e3c2ad08d..39453a827 100644 --- a/web/react/components/user_list.jsx +++ b/web/react/components/user_list.jsx @@ -24,7 +24,7 @@ export default class UserList extends React.Component { <tr key='no-users-found'> <td> <FormattedMessage - id='more_direct_channels.notFound' + id='user_list.notFound' defaultMessage='No users found :(' /> </td> |