Этот коммит содержится в:
Tatsuya Niwa
2016-01-30 02:19:41 +09:00
родитель ae2201b304
Коммит 8b2fb86c3a
3 изменённых файлов: 28 добавлений и 4 удалений

Просмотреть файл

@@ -7,7 +7,22 @@ import UserStore from '../../stores/user_store.jsx';
import ConfirmModal from '../confirm_modal.jsx'; import ConfirmModal from '../confirm_modal.jsx';
import TeamStore from '../../stores/team_store.jsx'; import TeamStore from '../../stores/team_store.jsx';
import {FormattedMessage} from 'mm-intl'; import {injectIntl, intlShape, defineMessages, FormattedMessage} from 'mm-intl';
var messages = defineMessages({
confirmDemoteRoleTitle: {
id: 'admin.user_item.confirmDemoteRoleTitle',
defaultMessage: 'Confirm demotion from System Admin role'
},
confirmDemotion: {
id: 'admin.user_item.confirmDemotion',
defaultMessage: 'Confirm Demotion'
},
confirmDemoteDescription: {
id: 'admin.user_item.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.'
}
});
export default class UserItem extends React.Component { export default class UserItem extends React.Component {
constructor(props) { constructor(props) {
@@ -322,9 +337,9 @@ export default class UserItem extends React.Component {
makeDemoteModal = ( makeDemoteModal = (
<ConfirmModal <ConfirmModal
show={this.state.showDemoteModal} show={this.state.showDemoteModal}
title='Confirm demotion from System Admin role' title={this.props.intl.formatMessage(messages.confirmDemoteRoleTitle)}
message={[`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.`, React.createElement('br'), React.createElement('br'), `./platform -assign_role -team_name="yourteam" -email="name@yourcompany.com" -role="system_admin"`, serverError]} message={[this.props.intl.formatMessage(messages.confirmDemoteDescription), React.createElement('br'), React.createElement('br'), './platform -assign_role -team_name="yourteam" -email="name@yourcompany.com" -role="system_admin"', serverError]}
confirm_button='Confirm Demotion' confirm_button={this.props.intl.formatMessage(messages.confirmDemotion)}
onConfirm={this.handleDemoteSubmit} onConfirm={this.handleDemoteSubmit}
onCancel={this.handleDemoteCancel} onCancel={this.handleDemoteCancel}
/> />
@@ -385,7 +400,10 @@ export default class UserItem extends React.Component {
} }
UserItem.propTypes = { UserItem.propTypes = {
intl: intlShape.isRequired,
user: React.PropTypes.object.isRequired, user: React.PropTypes.object.isRequired,
refreshProfiles: React.PropTypes.func.isRequired, refreshProfiles: React.PropTypes.func.isRequired,
doPasswordReset: React.PropTypes.func.isRequired doPasswordReset: React.PropTypes.func.isRequired
}; };
export default injectIntl(UserItem);

Просмотреть файл

@@ -396,6 +396,9 @@
"admin.user_item.makeActive": "Make Active", "admin.user_item.makeActive": "Make Active",
"admin.user_item.makeInactive": "Make Inactive", "admin.user_item.makeInactive": "Make Inactive",
"admin.user_item.resetPwd": "Reset Password", "admin.user_item.resetPwd": "Reset Password",
"admin.user_item.confirmDemoteRoleTitle": "Confirm demotion from System Admin role",
"admin.user_item.confirmDemotion": "Confirm Demotion",
"admin.user_item.confirmDemoteDescription": "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.",
"authorize.title": "An application would like to connect to your {teamName} account", "authorize.title": "An application would like to connect to your {teamName} account",
"authorize.app": "The app {appName} would like the ability to access and modify your basic information.", "authorize.app": "The app {appName} would like the ability to access and modify your basic information.",
"authorize.access": "Allow {appName} access?", "authorize.access": "Allow {appName} access?",

Просмотреть файл

@@ -396,6 +396,9 @@
"admin.user_item.resetPwd": "Reiniciar Contraseña", "admin.user_item.resetPwd": "Reiniciar Contraseña",
"admin.user_item.sysAdmin": "Admin de Sistema", "admin.user_item.sysAdmin": "Admin de Sistema",
"admin.user_item.teamAdmin": "Admin de Equipo", "admin.user_item.teamAdmin": "Admin de Equipo",
"admin.user_item.confirmDemoteRoleTitle": "Confirm demotion from System Admin role",
"admin.user_item.confirmDemotion": "Confirm Demotion",
"admin.user_item.confirmDemoteDescription": "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.",
"authorize.access": "¿Permitir acceso a {appName}?", "authorize.access": "¿Permitir acceso a {appName}?",
"authorize.allow": "Permitir", "authorize.allow": "Permitir",
"authorize.app": "La app {appName} quiere tener la abilidad de accesar y modificar tu información básica.", "authorize.app": "La app {appName} quiere tener la abilidad de accesar y modificar tu información básica.",