summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorTatsuya Niwa <tty.niwa@gmail.com>2016-01-30 02:19:41 +0900
committerTatsuya Niwa <tty.niwa@gmail.com>2016-01-30 02:28:38 +0900
commit8b2fb86c3a21f7d4bccc4f3497e6f9d514cbad0c (patch)
treec43b623d352683b76bcb7b1d6619c16138bbb053 /web
parentae2201b304dc5da907d23dfe1f7da6f7a01c2b6d (diff)
downloadchat-8b2fb86c3a21f7d4bccc4f3497e6f9d514cbad0c.tar.gz
chat-8b2fb86c3a21f7d4bccc4f3497e6f9d514cbad0c.tar.bz2
chat-8b2fb86c3a21f7d4bccc4f3497e6f9d514cbad0c.zip
fix text localization.
Diffstat (limited to 'web')
-rw-r--r--web/react/components/admin_console/user_item.jsx26
-rw-r--r--web/static/i18n/en.json3
-rw-r--r--web/static/i18n/es.json3
3 files changed, 28 insertions, 4 deletions
diff --git a/web/react/components/admin_console/user_item.jsx b/web/react/components/admin_console/user_item.jsx
index 032b698cd..5ab429dd5 100644
--- a/web/react/components/admin_console/user_item.jsx
+++ b/web/react/components/admin_console/user_item.jsx
@@ -7,7 +7,22 @@ import UserStore from '../../stores/user_store.jsx';
import ConfirmModal from '../confirm_modal.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 {
constructor(props) {
@@ -322,9 +337,9 @@ export default class UserItem extends React.Component {
makeDemoteModal = (
<ConfirmModal
show={this.state.showDemoteModal}
- title='Confirm demotion from System Admin role'
- 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]}
- confirm_button='Confirm Demotion'
+ title={this.props.intl.formatMessage(messages.confirmDemoteRoleTitle)}
+ 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={this.props.intl.formatMessage(messages.confirmDemotion)}
onConfirm={this.handleDemoteSubmit}
onCancel={this.handleDemoteCancel}
/>
@@ -385,7 +400,10 @@ export default class UserItem extends React.Component {
}
UserItem.propTypes = {
+ intl: intlShape.isRequired,
user: React.PropTypes.object.isRequired,
refreshProfiles: React.PropTypes.func.isRequired,
doPasswordReset: React.PropTypes.func.isRequired
};
+
+export default injectIntl(UserItem);
diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json
index 1a82660fd..6afdafcff 100644
--- a/web/static/i18n/en.json
+++ b/web/static/i18n/en.json
@@ -396,6 +396,9 @@
"admin.user_item.makeActive": "Make Active",
"admin.user_item.makeInactive": "Make Inactive",
"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.app": "The app {appName} would like the ability to access and modify your basic information.",
"authorize.access": "Allow {appName} access?",
diff --git a/web/static/i18n/es.json b/web/static/i18n/es.json
index d54c99535..71465ad1e 100644
--- a/web/static/i18n/es.json
+++ b/web/static/i18n/es.json
@@ -396,6 +396,9 @@
"admin.user_item.resetPwd": "Reiniciar Contraseña",
"admin.user_item.sysAdmin": "Admin de Sistema",
"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.allow": "Permitir",
"authorize.app": "La app {appName} quiere tener la abilidad de accesar y modificar tu información básica.",