From 8b7f69d94f75fd235d759095792fa56890cb9873 Mon Sep 17 00:00:00 2001 From: Paul Kaplan <pkaplan@media.mit.edu> Date: Thu, 3 May 2018 11:05:13 -0400 Subject: [PATCH] Fix stage naming by using intl.formatMessage instead of component. Fixes #1955 --- src/components/sprite-info/sprite-info.jsx | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/components/sprite-info/sprite-info.jsx b/src/components/sprite-info/sprite-info.jsx index 76c1548df..7213277b4 100644 --- a/src/components/sprite-info/sprite-info.jsx +++ b/src/components/sprite-info/sprite-info.jsx @@ -7,7 +7,7 @@ import Box from '../box/box.jsx'; import Label from '../forms/label.jsx'; import Input from '../forms/input.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 styles from './sprite-info.css'; @@ -19,6 +19,14 @@ import hideIcon from './icon--hide.svg'; 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 { shouldComponentUpdate (nextProps) { return ( @@ -39,13 +47,6 @@ class SpriteInfo extends React.Component { id="gui.SpriteInfo.sprite" /> ); - const spritePlaceholder = ( - <FormattedMessage - defaultMessage="Name" - description="Placeholder text for sprite name" - id="gui.SpriteInfo.spritePlaceholder" - /> - ); const showLabel = ( <FormattedMessage defaultMessage="Show" @@ -77,7 +78,7 @@ class SpriteInfo extends React.Component { <BufferedInput className={styles.spriteInput} disabled={this.props.disabled} - placeholder={spritePlaceholder} + placeholder={this.props.intl.formatMessage(messages.spritePlaceholder)} tabIndex="0" type="text" value={this.props.disabled ? '' : this.props.name} @@ -226,6 +227,7 @@ SpriteInfo.propTypes = { PropTypes.number ]), disabled: PropTypes.bool, + intl: intlShape, name: PropTypes.string, onChangeDirection: PropTypes.func, onChangeName: PropTypes.func, @@ -251,4 +253,4 @@ SpriteInfo.propTypes = { ]) }; -export default SpriteInfo; +export default injectIntl(SpriteInfo); -- GitLab