diff options
author | =Corey Hulen <corey@hulen.com> | 2016-02-01 14:44:17 -0800 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2016-02-01 14:44:17 -0800 |
commit | b4ec6900510077253290e361d1a706e5368a45de (patch) | |
tree | 6fc7c131fa7aa5f32e3aba8102416aa23c65963d /web/react/components/tutorial/tutorial_tip.jsx | |
parent | ea71731f838fc010cfc7511c09875184d1b2396b (diff) | |
parent | f28486c4553f7f4bccf7bf69153c2f12699705f9 (diff) | |
download | chat-b4ec6900510077253290e361d1a706e5368a45de.tar.gz chat-b4ec6900510077253290e361d1a706e5368a45de.tar.bz2 chat-b4ec6900510077253290e361d1a706e5368a45de.zip |
Fixing merge
Diffstat (limited to 'web/react/components/tutorial/tutorial_tip.jsx')
-rw-r--r-- | web/react/components/tutorial/tutorial_tip.jsx | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/web/react/components/tutorial/tutorial_tip.jsx b/web/react/components/tutorial/tutorial_tip.jsx index 03ecdabab..6bd7d89a4 100644 --- a/web/react/components/tutorial/tutorial_tip.jsx +++ b/web/react/components/tutorial/tutorial_tip.jsx @@ -6,6 +6,9 @@ import PreferenceStore from '../../stores/preference_store.jsx'; import * as AsyncClient from '../../utils/async_client.jsx'; import Constants from '../../utils/constants.jsx'; + +import {FormattedMessage} from 'mm-intl'; + const Preferences = Constants.Preferences; const Overlay = ReactBootstrap.Overlay; @@ -46,7 +49,17 @@ export default class TutorialTip extends React.Component { AsyncClient.savePreferences([preference]); } render() { - const buttonText = this.state.currentScreen === this.props.screens.length - 1 ? 'Okay' : 'Next'; + const buttonText = this.state.currentScreen === this.props.screens.length - 1 ? ( + <FormattedMessage + id='tutorial_tip.ok' + defaultMessage='Okay' + /> + ) : ( + <FormattedMessage + id='tutorial_tip.next' + defaultMessage='Next' + /> + ); const dots = []; if (this.props.screens.length > 1) { @@ -71,7 +84,7 @@ export default class TutorialTip extends React.Component { } var tipColor = ''; - if (this.props.overlayClass === 'tip-overlay--header') { + if (this.props.overlayClass === 'tip-overlay--header' || this.props.overlayClass === 'tip-overlay--sidebar') { tipColor = 'White'; } @@ -111,12 +124,18 @@ export default class TutorialTip extends React.Component { {buttonText} </button> <div className='tip-opt'> - {'Seen this before? '} + <FormattedMessage + id='tutorial_tip.seen' + defaultMessage='Seen this before? ' + /> <a href='#' onClick={this.skipTutorial} > - {'Opt out of these tips.'} + <FormattedMessage + id='tutorial_tip.out' + defaultMessage='Opt out of these tips.' + /> </a> </div> </div> |