Skip to content
Snippets Groups Projects
Unverified Commit 95a1bf30 authored by Paul Kaplan's avatar Paul Kaplan Committed by GitHub
Browse files

Merge pull request #1956 from paulkaplan/fix-stage-name

Fix stage naming by using intl.formatMessage instead of component.
parents 0a1545e9 8b7f69d9
No related branches found
No related tags found
No related merge requests found
...@@ -7,7 +7,7 @@ import Box from '../box/box.jsx'; ...@@ -7,7 +7,7 @@ import Box from '../box/box.jsx';
import Label from '../forms/label.jsx'; import Label from '../forms/label.jsx';
import Input from '../forms/input.jsx'; import Input from '../forms/input.jsx';
import BufferedInputHOC from '../forms/buffered-input-hoc.jsx'; import BufferedInputHOC from '../forms/buffered-input-hoc.jsx';
import {FormattedMessage} from 'react-intl'; import {injectIntl, intlShape, defineMessages, FormattedMessage} from 'react-intl';
import layout from '../../lib/layout-constants.js'; import layout from '../../lib/layout-constants.js';
import styles from './sprite-info.css'; import styles from './sprite-info.css';
...@@ -19,6 +19,14 @@ import hideIcon from './icon--hide.svg'; ...@@ -19,6 +19,14 @@ import hideIcon from './icon--hide.svg';
const BufferedInput = BufferedInputHOC(Input); const BufferedInput = BufferedInputHOC(Input);
const messages = defineMessages({
spritePlaceholder: {
id: 'gui.SpriteInfo.spritePlaceholder',
defaultMessage: 'Name',
description: 'Placeholder text for sprite name'
}
});
class SpriteInfo extends React.Component { class SpriteInfo extends React.Component {
shouldComponentUpdate (nextProps) { shouldComponentUpdate (nextProps) {
return ( return (
...@@ -39,13 +47,6 @@ class SpriteInfo extends React.Component { ...@@ -39,13 +47,6 @@ class SpriteInfo extends React.Component {
id="gui.SpriteInfo.sprite" id="gui.SpriteInfo.sprite"
/> />
); );
const spritePlaceholder = (
<FormattedMessage
defaultMessage="Name"
description="Placeholder text for sprite name"
id="gui.SpriteInfo.spritePlaceholder"
/>
);
const showLabel = ( const showLabel = (
<FormattedMessage <FormattedMessage
defaultMessage="Show" defaultMessage="Show"
...@@ -77,7 +78,7 @@ class SpriteInfo extends React.Component { ...@@ -77,7 +78,7 @@ class SpriteInfo extends React.Component {
<BufferedInput <BufferedInput
className={styles.spriteInput} className={styles.spriteInput}
disabled={this.props.disabled} disabled={this.props.disabled}
placeholder={spritePlaceholder} placeholder={this.props.intl.formatMessage(messages.spritePlaceholder)}
tabIndex="0" tabIndex="0"
type="text" type="text"
value={this.props.disabled ? '' : this.props.name} value={this.props.disabled ? '' : this.props.name}
...@@ -226,6 +227,7 @@ SpriteInfo.propTypes = { ...@@ -226,6 +227,7 @@ SpriteInfo.propTypes = {
PropTypes.number PropTypes.number
]), ]),
disabled: PropTypes.bool, disabled: PropTypes.bool,
intl: intlShape,
name: PropTypes.string, name: PropTypes.string,
onChangeDirection: PropTypes.func, onChangeDirection: PropTypes.func,
onChangeName: PropTypes.func, onChangeName: PropTypes.func,
...@@ -251,4 +253,4 @@ SpriteInfo.propTypes = { ...@@ -251,4 +253,4 @@ SpriteInfo.propTypes = {
]) ])
}; };
export default SpriteInfo; export default injectIntl(SpriteInfo);
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment